diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index ab19ca3ec03..6394760542e 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -682,7 +682,7 @@ static CPU_INIT( tms34010 ) tms->irq_callback = irqcallback; tms->device = device; tms->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM); - tms->screen = devtag_get_device(device->machine, VIDEO_SCREEN, configdata->screen_tag); + tms->screen = devtag_get_device(device->machine, configdata->screen_tag); /* set up the state table */ tms->state = state_table_template; diff --git a/src/emu/cpu/z80/z80daisy.c b/src/emu/cpu/z80/z80daisy.c index 0a3b380e9bf..f7a6ebfc27f 100644 --- a/src/emu/cpu/z80/z80daisy.c +++ b/src/emu/cpu/z80/z80daisy.c @@ -27,11 +27,11 @@ z80_daisy_state *z80daisy_init(const device_config *cpudevice, const z80_daisy_c z80_daisy_state **tailptr = &head; /* create a linked list of devices */ - for ( ; daisy->devtype != NULL; daisy++) + for ( ; daisy->devname != NULL; daisy++) { *tailptr = auto_malloc(sizeof(**tailptr)); (*tailptr)->next = NULL; - (*tailptr)->device = devtag_get_device(cpudevice->machine, daisy->devtype, device_inherit_tag(tempstring, cpudevice->tag, daisy->devname)); + (*tailptr)->device = devtag_get_device(cpudevice->machine, device_inherit_tag(tempstring, cpudevice->tag, daisy->devname)); if ((*tailptr)->device == NULL) fatalerror("Unable to locate device '%s'", daisy->devname); (*tailptr)->irq_state = (z80_daisy_irq_state)device_get_info_fct((*tailptr)->device, DEVINFO_FCT_IRQ_STATE); diff --git a/src/emu/cpu/z80/z80daisy.h b/src/emu/cpu/z80/z80daisy.h index 155d4c07b7d..1a710a7c06c 100644 --- a/src/emu/cpu/z80/z80daisy.h +++ b/src/emu/cpu/z80/z80daisy.h @@ -50,7 +50,6 @@ typedef struct _z80_daisy_state z80_daisy_state; typedef struct _z80_daisy_chain z80_daisy_chain; struct _z80_daisy_chain { - device_type devtype; /* type of device */ const char * devname; /* name of the device */ }; diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index b02bc425c72..bb4c70a26b0 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -588,7 +588,7 @@ static DEVICE_RESET( cpu ) /* new style - use screen tag directly */ if (config->vblank_interrupt_screen != NULL) - screen = devtag_get_device(device->machine, VIDEO_SCREEN, config->vblank_interrupt_screen); + screen = devtag_get_device(device->machine, config->vblank_interrupt_screen); /* old style 'hack' setup - use screen #0 */ else diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h index a104750c5c0..551c9a4f1cb 100644 --- a/src/emu/cpuexec.h +++ b/src/emu/cpuexec.h @@ -93,10 +93,10 @@ struct _cpu_class_header MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, type, CPU_##_type) #define MDRV_CPU_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, CPU) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_CPU_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag, CPU) + MDRV_DEVICE_MODIFY(_tag) #define MDRV_CPU_TYPE(_type) \ MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, type, CPU_##_type) @@ -105,7 +105,7 @@ struct _cpu_class_header MDRV_DEVICE_CLOCK(_clock) #define MDRV_CPU_REPLACE(_tag, _type, _clock) \ - MDRV_DEVICE_MODIFY(_tag, CPU) \ + MDRV_DEVICE_MODIFY(_tag) \ MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, type, CPU_##_type) \ MDRV_DEVICE_CLOCK(_clock) @@ -145,10 +145,10 @@ struct _cpu_class_header #define INTERRUPT_GEN(func) void func(const device_config *device) /* return a pointer to the given CPU by tag */ -#define cputag_get_cpu(mach, tag) devtag_get_device(mach, CPU, tag) +#define cputag_get_cpu(mach, tag) devtag_get_device(mach, tag) /* helpers for using machine/cputag instead of cpu objects */ -#define cputag_reset(mach, tag) devtag_reset(mach, CPU, tag) +#define cputag_reset(mach, tag) devtag_reset(mach, tag) #define cputag_get_index(mach, tag) cpu_get_index(cputag_get_cpu(mach, tag)) #define cputag_get_address_space(mach, tag, space) cpu_get_address_space(cputag_get_cpu(mach, tag), space) #define cputag_suspend(mach, tag, reason, eat) cpu_suspend(cputag_get_cpu(mach, tag), reason, eat) diff --git a/src/emu/devcb.c b/src/emu/devcb.c index 2f6fc3fc043..efe68e179f8 100644 --- a/src/emu/devcb.c +++ b/src/emu/devcb.c @@ -65,11 +65,11 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea } /* device handlers */ - else if (config->type != NULL && (config->readline != NULL || config->readdevice != NULL)) + else if ((config->type == DEVCB_TYPE_DEVICE || config->type == DEVCB_TYPE_SELF) && (config->readline != NULL || config->readdevice != NULL)) { - resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); + resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->tag); if (resolved->target == NULL) - fatalerror("devcb_resolve_read_line: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); + fatalerror("devcb_resolve_read_line: unable to find device '%s' (requested by %s '%s')", config->tag, device_get_name(device), device->tag); /* read_line to read_line is direct */ if (config->readline != NULL) @@ -141,11 +141,11 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w } /* device handlers */ - else if (config->type != NULL && (config->writeline != NULL || config->writedevice != NULL)) + else if ((config->type == DEVCB_TYPE_DEVICE || config->type == DEVCB_TYPE_SELF) && (config->writeline != NULL || config->writedevice != NULL)) { - resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); + resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->tag); if (resolved->target == NULL) - fatalerror("devcb_resolve_write_line: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); + fatalerror("devcb_resolve_write_line: unable to find device '%s' (requested by %s '%s')", config->tag, device_get_name(device), device->tag); /* write_line to write_line is direct */ if (config->writeline != NULL) @@ -208,11 +208,11 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf } /* device handlers */ - else if (config->type != NULL && (config->readline != NULL || config->readdevice != NULL)) + else if ((config->type == DEVCB_TYPE_DEVICE || config->type == DEVCB_TYPE_SELF) && (config->readline != NULL || config->readdevice != NULL)) { - resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); + resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->tag); if (resolved->target == NULL) - fatalerror("devcb_resolve_read8: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); + fatalerror("devcb_resolve_read8: unable to find device '%s' (requested by %s '%s')", config->tag, device_get_name(device), device->tag); /* read8 to read8 is direct */ if (config->readdevice != NULL) @@ -261,11 +261,11 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c } /* device handlers */ - else if (config->type != NULL && (config->writeline != NULL || config->writedevice != NULL)) + else if ((config->type == DEVCB_TYPE_DEVICE || config->type == DEVCB_TYPE_SELF) && (config->writeline != NULL || config->writedevice != NULL)) { - resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); + resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->tag); if (resolved->target == NULL) - fatalerror("devcb_resolve_write8: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); + fatalerror("devcb_resolve_write8: unable to find device '%s' (requested by %s '%s')", config->tag, device_get_name(device), device->tag); /* write8 to write8 is direct */ if (config->writedevice != NULL) diff --git a/src/emu/devcb.h b/src/emu/devcb.h index aa1eea6afca..fdbd2cd4c7d 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -47,10 +47,12 @@ CONSTANTS ***************************************************************************/ -#define DEVCB_TYPE_SELF ((device_type)1) -#define DEVCB_TYPE_INPUT ((device_type)2) -#define DEVCB_TYPE_MEMORY(space) ((device_type)(4 + (space))) -#define DEVCB_TYPE_CPU_LINE(line) ((device_type)(4 + ADDRESS_SPACES + (line))) +#define DEVCB_TYPE_NULL (0) +#define DEVCB_TYPE_SELF (1) +#define DEVCB_TYPE_INPUT (2) +#define DEVCB_TYPE_DEVICE (3) +#define DEVCB_TYPE_MEMORY(space) (4 + (space)) +#define DEVCB_TYPE_CPU_LINE(line) (4 + ADDRESS_SPACES + (line)) @@ -58,15 +60,15 @@ MACROS ***************************************************************************/ -#define DEVCB_NULL { 0 } +#define DEVCB_NULL { DEVCB_TYPE_NULL } /* standard line or read/write handlers with the calling device passed */ #define DEVCB_LINE(func) { DEVCB_TYPE_SELF, NULL, (func), NULL, NULL } #define DEVCB_HANDLER(func) { DEVCB_TYPE_SELF, NULL, NULL, (func), NULL } /* line or read/write handlers for another device */ -#define DEVCB_DEVICE_LINE(type,tag,func) { type, tag, (func), NULL, NULL } -#define DEVCB_DEVICE_HANDLER(type,tag,func) { type, tag, NULL, (func), NULL } +#define DEVCB_DEVICE_LINE(tag,func) { DEVCB_TYPE_DEVICE, tag, (func), NULL, NULL } +#define DEVCB_DEVICE_HANDLER(tag,func) { DEVCB_TYPE_DEVICE, tag, NULL, (func), NULL } /* read/write handlers for a given CPU's address space */ #define DEVCB_MEMORY_HANDLER(cpu,space,func) { DEVCB_TYPE_MEMORY(ADDRESS_SPACE_##space), (cpu), NULL, NULL, (func) } @@ -97,7 +99,7 @@ typedef void (*write_line_device_func)(const device_config *device, int state); typedef struct _devcb_read_line devcb_read_line; struct _devcb_read_line { - device_type type; /* device type of target, or one of the special DEVCB_TYPE values */ + UINT32 type; /* one of the special DEVCB_TYPE values */ const char * tag; /* tag of target, where appropriate */ read_line_device_func readline; /* read line function */ read8_device_func readdevice; /* read device function */ @@ -122,7 +124,7 @@ struct _devcb_resolved_read_line typedef struct _devcb_write_line devcb_write_line; struct _devcb_write_line { - device_type type; /* device type of target, or one of the special DEVCB_TYPE values */ + UINT32 type; /* one of the special DEVCB_TYPE values */ const char * tag; /* tag of target, where appropriate */ write_line_device_func writeline; /* write line function */ write8_device_func writedevice; /* write device function */ @@ -148,7 +150,7 @@ struct _devcb_resolved_write_line typedef struct _devcb_read8 devcb_read8; struct _devcb_read8 { - device_type type; /* device type of target, or one of the special DEVCB_TYPE values */ + UINT32 type; /* one of the special DEVCB_TYPE values */ const char * tag; /* tag of target, where appropriate */ read_line_device_func readline; /* read line function */ read8_device_func readdevice; /* read device function */ @@ -174,7 +176,7 @@ struct _devcb_resolved_read8 typedef struct _devcb_write8 devcb_write8; struct _devcb_write8 { - device_type type; /* device type of target, or one of the special DEVCB_TYPE values */ + UINT32 type; /* one of the special DEVCB_TYPE values */ const char * tag; /* tag of target, where appropriate */ write_line_device_func writeline; /* write line function */ write8_device_func writedevice; /* write device function */ diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index de079258f06..fe290ff995d 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -168,25 +168,24 @@ device_config *device_list_add(device_config **listheadptr, const device_config device list -------------------------------------------------*/ -void device_list_remove(device_config **listheadptr, device_type type, const char *tag) +void device_list_remove(device_config **listheadptr, const char *tag) { device_config **devptr, **tempdevptr; device_config *device, *tempdevice; assert(listheadptr != NULL); - assert(type != NULL); assert(tag != NULL); /* find the device in the list */ for (devptr = listheadptr; *devptr != NULL; devptr = &(*devptr)->next) - if (type == (*devptr)->type && strcmp(tag, (*devptr)->tag) == 0) + if (strcmp(tag, (*devptr)->tag) == 0) break; device = *devptr; if (device == NULL) - fatalerror("Attempted to remove non-existant device: type=%s tag=%s\n", devtype_get_name(type), tag); + fatalerror("Attempted to remove non-existant device: tag=%s\n", tag); /* before removing us from the global list, remove us from the type list */ - tempdevice = (device_config *)device_list_first(*listheadptr, type); + tempdevice = (device_config *)device_list_first(*listheadptr, device->type); for (tempdevptr = &tempdevice; *tempdevptr != device; tempdevptr = &(*tempdevptr)->typenext) ; assert(*tempdevptr == device); *tempdevptr = device->typenext; @@ -317,28 +316,16 @@ const device_config *device_list_next(const device_config *prevdevice, device_ty DEVICE_TYPE_WILDCARD is allowed -------------------------------------------------*/ -const device_config *device_list_find_by_tag(const device_config *listhead, device_type type, const char *tag) +const device_config *device_list_find_by_tag(const device_config *listhead, const char *tag) { const device_config *curdev; assert(tag != NULL); /* locate among all devices */ - if (type == DEVICE_TYPE_WILDCARD) - { - for (curdev = listhead; curdev != NULL; curdev = curdev->next) - if (strcmp(tag, curdev->tag) == 0) - return curdev; - } - - /* locate among all devices of a given type */ - else - { - for (curdev = listhead; curdev != NULL && curdev->type != type; curdev = curdev->next) ; - for ( ; curdev != NULL; curdev = curdev->typenext) - if (strcmp(tag, curdev->tag) == 0) - return curdev; - } + for (curdev = listhead; curdev != NULL; curdev = curdev->next) + if (strcmp(tag, curdev->tag) == 0) + return curdev; /* fail */ return NULL; @@ -467,28 +454,6 @@ const device_config *device_list_class_next(const device_config *prevdevice, dev } -/*------------------------------------------------- - device_list_class_find_by_tag - retrieve a - device configuration based on a class and tag --------------------------------------------------*/ - -const device_config *device_list_class_find_by_tag(const device_config *listhead, device_class devclass, const char *tag) -{ - const device_config *curdev; - - assert(tag != NULL); - - /* locate among all devices of a given class */ - for (curdev = listhead; curdev != NULL && curdev->devclass != devclass; curdev = curdev->next) ; - for ( ; curdev != NULL; curdev = curdev->classnext) - if (strcmp(tag, curdev->tag) == 0) - return curdev; - - /* fail */ - return NULL; -} - - /*------------------------------------------------- device_list_class_index - return the index of a device based on its class and tag diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index 587a138ded0..6c756958ee0 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -139,18 +139,18 @@ enum /* shorthand for accessing devices by machine/type/tag */ -#define devtag_get_device(mach,type,tag) device_list_find_by_tag((mach)->config->devicelist, type, tag) +#define devtag_get_device(mach,tag) device_list_find_by_tag((mach)->config->devicelist, tag) -#define devtag_reset(mach,type,tag) device_reset(devtag_get_device(mach, type, tag)) +#define devtag_reset(mach,tag) device_reset(devtag_get_device(mach, tag)) -#define devtag_get_info_int(mach,type,tag,state) device_get_info_int(devtag_get_device(mach, type, tag), state) -#define devtag_get_info_ptr(mach,type,tag,state) device_get_info_ptr(devtag_get_device(mach, type, tag), state) -#define devtag_get_info_fct(mach,type,tag,state) device_get_info_fct(devtag_get_device(mach, type, tag), state) -#define devtag_get_info_string(mach,type,tag,state) device_get_info_string(devtag_get_device(mach, type, tag), state) +#define devtag_get_info_int(mach,tag,state) device_get_info_int(devtag_get_device(mach, tag), state) +#define devtag_get_info_ptr(mach,tag,state) device_get_info_ptr(devtag_get_device(mach, tag), state) +#define devtag_get_info_fct(mach,tag,state) device_get_info_fct(devtag_get_device(mach, tag), state) +#define devtag_get_info_string(mach,tag,state) device_get_info_string(devtag_get_device(mach, tag), state) -#define devtag_set_info_int(mach,type,tag,state,data) device_set_info_int(devtag_get_device(mach, type, tag), state, data) -#define devtag_set_info_ptr(mach,type,tag,state,data) device_set_info_ptr(devtag_get_device(mach, type, tag), state, data) -#define devtag_set_info_fct(mach,type,tag,state,data) device_set_info_fct(devtag_get_device(mach, type, tag), state, data) +#define devtag_set_info_int(mach,tag,state,data) device_set_info_int(devtag_get_device(mach, tag), state, data) +#define devtag_set_info_ptr(mach,tag,state,data) device_set_info_ptr(devtag_get_device(mach, tag), state, data) +#define devtag_set_info_fct(mach,tag,state,data) device_set_info_fct(devtag_get_device(mach, tag), state, data) /* shorthand for getting standard data about device types */ @@ -170,11 +170,11 @@ enum /* shorthand for getting standard data about devices by machine/type/tag */ -#define devtag_get_name(mach,type,tag) devtag_get_info_string(mach, type, tag, DEVINFO_STR_NAME) -#define devtag_get_family(mach,type,tag) devtag_get_info_string(mach, type, tag, DEVINFO_STR_FAMILY) -#define devtag_get_version(mach,type,tag) devtag_get_info_string(mach, type, tag, DEVINFO_STR_VERSION) -#define devtag_get_source_file(mach,type,tag) devtag_get_info_string(mach, type, tag, DEVINFO_STR_SOURCE_FILE) -#define devtag_get_credits(mach,type,tag) devtag_get_info_string(mach, type, tag, DEVINFO_STR_CREDITS) +#define devtag_get_name(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_NAME) +#define devtag_get_family(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_FAMILY) +#define devtag_get_version(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_VERSION) +#define devtag_get_source_file(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_SOURCE_FILE) +#define devtag_get_credits(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_CREDITS) @@ -271,7 +271,7 @@ struct _device_config device_config *device_list_add(device_config **listheadptr, const device_config *owner, device_type type, const char *tag, UINT32 clock); /* remove a device from a device list */ -void device_list_remove(device_config **listheadptr, device_type type, const char *tag); +void device_list_remove(device_config **listheadptr, const char *tag); /* build a tag that combines the device's name and the given tag */ const char *device_build_tag(astring *dest, const device_config *device, const char *tag); @@ -292,8 +292,8 @@ const device_config *device_list_first(const device_config *listhead, device_typ /* return the next device in the list of a given type; DEVICE_TYPE_WILDCARD is allowed */ const device_config *device_list_next(const device_config *prevdevice, device_type type); -/* retrieve a device configuration based on a type and tag; DEVICE_TYPE_WILDCARD is allowed */ -const device_config *device_list_find_by_tag(const device_config *listhead, device_type type, const char *tag); +/* retrieve a device configuration based on a tag */ +const device_config *device_list_find_by_tag(const device_config *listhead, const char *tag); /* return the index of a device based on its type and tag; DEVICE_TYPE_WILDCARD is allowed */ int device_list_index(const device_config *listhead, device_type type, const char *tag); @@ -314,9 +314,6 @@ const device_config *device_list_class_first(const device_config *listhead, devi /* return the next device in the list of a given class */ const device_config *device_list_class_next(const device_config *prevdevice, device_class devclass); -/* retrieve a device configuration based on a class and tag */ -const device_config *device_list_class_find_by_tag(const device_config *listhead, device_class devclass, const char *tag); - /* return the index of a device based on its class and tag */ int device_list_class_index(const device_config *listhead, device_class devclass, const char *tag); diff --git a/src/emu/machine/6522via.h b/src/emu/machine/6522via.h index 93ad1e2883f..6c9f0e675eb 100644 --- a/src/emu/machine/6522via.h +++ b/src/emu/machine/6522via.h @@ -28,7 +28,7 @@ MDRV_DEVICE_CONFIG(_intrf) #define MDRV_VIA6522_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, VIA6522) + MDRV_DEVICE_REMOVE(_tag) #define VIA_PB 0 #define VIA_PA 1 diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h index f8cea3d34aa..eb227e76501 100644 --- a/src/emu/machine/6526cia.h +++ b/src/emu/machine/6526cia.h @@ -25,15 +25,15 @@ MDRV_DEVICE_ADD(_tag, _variant, _clock) \ MDRV_DEVICE_CONFIG(_config) -#define MDRV_CIA6526_REMOVE(_tag, _variant) \ - MDRV_DEVICE_REMOVE(_tag, _variant) +#define MDRV_CIA6526_REMOVE(_tag) \ + MDRV_DEVICE_REMOVE(_tag) #define MDRV_CIA8520_ADD(_tag, _clock, _config) \ MDRV_DEVICE_ADD(_tag, CIA8520, _clock) \ MDRV_DEVICE_CONFIG(_config) #define MDRV_CIA8520_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, CIA8520) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h index d7bb08fd7d0..b752f4119e7 100644 --- a/src/emu/machine/6532riot.h +++ b/src/emu/machine/6532riot.h @@ -38,7 +38,7 @@ struct _riot6532_interface MDRV_DEVICE_CONFIG(_intrf) #define MDRV_RIOT6532_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, RIOT6532) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/6821new.h b/src/emu/machine/6821new.h index d7e5164b6dd..42a0a99d0ff 100644 --- a/src/emu/machine/6821new.h +++ b/src/emu/machine/6821new.h @@ -111,21 +111,21 @@ int pianew_get_irq_b(const device_config *device); MDRV_DEVICE_CONFIG(_intrf) #define MDRV_PIA6821_MODIFY(_tag, _intrf) \ - MDRV_DEVICE_MODIFY(_tag, PIA6821) \ + MDRV_DEVICE_MODIFY(_tag) \ MDRV_DEVICE_CONFIG(_intrf) #define MDRV_PIA6821_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, PIA6821) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_PIA6822_ADD(_tag, _intrf) \ MDRV_DEVICE_ADD(_tag, PIA6822, 0) \ MDRV_DEVICE_CONFIG(_intrf) #define MDRV_PIA6822_MODIFY(_tag, _intrf) \ - MDRV_DEVICE_MODIFY(_tag, PIA6822) \ + MDRV_DEVICE_MODIFY(_tag) \ MDRV_DEVICE_CONFIG(_intrf) #define MDRV_PIA6822_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, PIA6821) + MDRV_DEVICE_REMOVE(_tag) #endif /* __6821NEW_H__ */ diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h index 01acea834c6..022d0f09ef0 100644 --- a/src/emu/machine/6850acia.h +++ b/src/emu/machine/6850acia.h @@ -31,7 +31,7 @@ MDRV_DEVICE_CONFIG(_config) #define MDRV_ACIA6850_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, ACIA6850) + MDRV_DEVICE_REMOVE(_tag) #define ACIA6850_INTERFACE(_name) \ const acia6850_interface(_name) = diff --git a/src/emu/machine/68681.h b/src/emu/machine/68681.h index cf521bb7eb7..9c305f2d7a1 100644 --- a/src/emu/machine/68681.h +++ b/src/emu/machine/68681.h @@ -18,7 +18,7 @@ DEVICE_GET_INFO(duart68681); MDRV_DEVICE_CONFIG(_config) #define MDRV_DUART_68681_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, DUART68681) + MDRV_DEVICE_REMOVE(_tag) READ8_DEVICE_HANDLER(duart68681_r); diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h index 45f8d82e67d..2f6a2ab4cb5 100644 --- a/src/emu/machine/74123.h +++ b/src/emu/machine/74123.h @@ -53,7 +53,7 @@ MDRV_DEVICE_CONFIG(_config) #define MDRV_TTL74123_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, TTL74123) + MDRV_DEVICE_REMOVE(_tag) /* constants for the different ways the cap/res can be connected. diff --git a/src/emu/machine/8255ppi.h b/src/emu/machine/8255ppi.h index 63da954c212..747a165011f 100644 --- a/src/emu/machine/8255ppi.h +++ b/src/emu/machine/8255ppi.h @@ -40,11 +40,11 @@ struct _ppi8255_interface MDRV_DEVICE_CONFIG(_intrf) #define MDRV_PPI8255_RECONFIG(_tag, _intrf) \ - MDRV_DEVICE_MODIFY(_tag, PPI8255) \ + MDRV_DEVICE_MODIFY(_tag) \ MDRV_DEVICE_CONFIG(_intrf) #define MDRV_PPI8255_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, PPI8255) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/8257dma.h b/src/emu/machine/8257dma.h index b1d0498c1d1..894d0d6ecd8 100644 --- a/src/emu/machine/8257dma.h +++ b/src/emu/machine/8257dma.h @@ -14,7 +14,7 @@ MDRV_DEVICE_CONFIG(_config) #define MDRV_DMA8257_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, DMA8257) + MDRV_DEVICE_REMOVE(_tag) #define DMA8257_STATUS_UPDATE 0x10 diff --git a/src/emu/machine/at28c16.h b/src/emu/machine/at28c16.h index e5c75cb4a61..f9bd07dbcd2 100644 --- a/src/emu/machine/at28c16.h +++ b/src/emu/machine/at28c16.h @@ -22,7 +22,7 @@ DEVICE_GET_INFO(at28c16); MDRV_DEVICE_CONFIG_DATAPTR(at28c16_config, id, _id) #define MDRV_AT28C16_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, AT28C16) + MDRV_DEVICE_REMOVE(_tag) extern void at28c16_a9_12v( const device_config *device, int a9_12v ); diff --git a/src/emu/machine/cdp1852.h b/src/emu/machine/cdp1852.h index de4b927511a..ace42f1f4a7 100644 --- a/src/emu/machine/cdp1852.h +++ b/src/emu/machine/cdp1852.h @@ -40,7 +40,7 @@ MDRV_DEVICE_CONFIG(_config) #define MDRV_CDP1852_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, CDP1852) + MDRV_DEVICE_REMOVE(_tag) #define CDP1852_INTERFACE(_name) \ const cdp1852_interface (_name)= diff --git a/src/emu/machine/i8243.h b/src/emu/machine/i8243.h index 97d148dbf5a..58b67ede415 100644 --- a/src/emu/machine/i8243.h +++ b/src/emu/machine/i8243.h @@ -43,7 +43,7 @@ struct _i8243_config MDRV_DEVICE_CONFIG_DATAPTR(i8243_config, writehandler, _write) #define MDRV_I8243_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, I8243) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h index 86df8646151..47fd33360f6 100644 --- a/src/emu/machine/idectrl.h +++ b/src/emu/machine/idectrl.h @@ -50,7 +50,7 @@ struct _ide_config MDRV_DEVICE_CONFIG_DATA32(ide_config, bmspace, ADDRESS_SPACE_##_space) #define MDRV_IDE_CONTROLLER_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, IDE_CONTROLLER) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h index 5f6117c3ea3..b23b91f3451 100644 --- a/src/emu/machine/laserdsc.h +++ b/src/emu/machine/laserdsc.h @@ -127,8 +127,8 @@ struct _laserdisc_config MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscalex, _scalex, 24) \ MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscaley, _scaley, 24) -#define MDRV_LASERDISC_REMOVE(_tag, _type) \ - MDRV_DEVICE_REMOVE(_tag, _type) +#define MDRV_LASERDISC_REMOVE(_tag) \ + MDRV_DEVICE_REMOVE(_tag) /* use these to add laserdisc screens with proper video update parameters */ diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c index 74ec2b64f61..a9fac543876 100644 --- a/src/emu/machine/latch8.c +++ b/src/emu/machine/latch8.c @@ -45,7 +45,7 @@ static void update(const device_config *device, UINT8 new_val, UINT8 mask) UINT8 changed = old_val ^ latch8->value; for (i=0; i<8; i++) if (((changed & (1<intf->node_map[i] != 0) - discrete_sound_w(devtag_get_device(device->machine, SOUND, latch8->intf->node_device[i]), latch8->intf->node_map[i] , (latch8->value >> i) & 1); + discrete_sound_w(devtag_get_device(device->machine, latch8->intf->node_device[i]), latch8->intf->node_map[i] , (latch8->value >> i) & 1); } } @@ -208,7 +208,6 @@ static DEVICE_START( latch8 ) if (latch8->devices[i] != NULL) fatalerror("Device %s: Bit %d already has a handler.\n", device->tag, i); latch8->devices[i] = devtag_get_device(device->machine, - latch8->intf->devread[i].type, latch8->intf->devread[i].tag); if (latch8->devices[i] == NULL) fatalerror("Device %s: Unable to find device %s\n", device->tag, latch8->intf->devread[i].tag); diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h index b54a687085c..e83ec917eb1 100644 --- a/src/emu/machine/latch8.h +++ b/src/emu/machine/latch8.h @@ -26,7 +26,6 @@ struct _latch8_devread { /* only for byte reads, does not affect bit reads and node_map */ UINT32 from_bit; - device_type type; const char *tag; read8_device_func devread_handler; read8_space_func read_handler; @@ -70,9 +69,8 @@ struct _latch8_config MDRV_DEVICE_CONFIG_DATA32_ARRAY(latch8_config, node_map, _bit, _node) /* Upon read, replace bits by reading from another device handler */ -#define MDRV_LATCH8_DEVREAD(_bit, _type, _tag, _handler, _from_bit) \ +#define MDRV_LATCH8_DEVREAD(_bit, _tag, _handler, _from_bit) \ MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, type, _type) \ MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, tag, _tag) \ MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, devread_handler, _handler) \ @@ -83,21 +81,21 @@ struct _latch8_config /* remove device */ #define MDRV_LATCH8_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(LATCH8, _type) + MDRV_DEVICE_REMOVE(_tag) /* Accessor macros */ #define AM_LATCH8_READ(_tag) \ - AM_DEVREAD(LATCH8, _tag, latch8_r) + AM_DEVREAD(_tag, latch8_r) #define AM_LATCH8_READBIT(_tag, _bit) \ - AM_DEVREAD(LATCH8, _tag, latch8_bit ## _bit ## _q_r) + AM_DEVREAD(_tag, latch8_bit ## _bit ## _q_r) #define AM_LATCH8_WRITE(_tag) \ - AM_DEVWRITE(LATCH8, _tag, latch8_w) + AM_DEVWRITE(_tag, latch8_w) #define AM_LATCH8_READWRITE(_tag) \ - AM_DEVREADWRITE(LATCH8, _tag, latch8_r, latch8_w) + AM_DEVREADWRITE(_tag, latch8_r, latch8_w) /* device interface */ DEVICE_GET_INFO( latch8 ); diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c index 349b078cd33..76f6bc1e493 100644 --- a/src/emu/machine/ldcore.c +++ b/src/emu/machine/ldcore.c @@ -1066,7 +1066,7 @@ static void configuration_load(running_machine *machine, int config_type, xml_da for (ldnode = xml_get_sibling(parentnode->child, "device"); ldnode != NULL; ldnode = xml_get_sibling(ldnode->next, "device")) { const char *devtag = xml_get_attribute_string(ldnode, "tag", ""); - const device_config *device = device_list_find_by_tag(machine->config->devicelist, LASERDISC, devtag); + const device_config *device = devtag_get_device(machine, devtag); if (device != NULL) { laserdisc_state *ld = get_safe_token(device); @@ -1430,7 +1430,7 @@ static void init_audio(const device_config *device) ldcore_data *ldcore = ld->core; /* find the custom audio */ - ldcore->audiocustom = devtag_get_device(device->machine, SOUND, ldcore->config.sound); + ldcore->audiocustom = devtag_get_device(device->machine, ldcore->config.sound); /* allocate audio buffers */ ldcore->audiomaxsamples = ((UINT64)ldcore->samplerate * 1000000 + ldcore->fps_times_1million - 1) / ldcore->fps_times_1million; @@ -1458,7 +1458,7 @@ static DEVICE_START( laserdisc ) int index; /* ensure that our screen is started first */ - ld->screen = devtag_get_device(device->machine, VIDEO_SCREEN, config->screen); + ld->screen = devtag_get_device(device->machine, config->screen); assert(ld->screen != NULL); if (!ld->screen->started) { diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c index c66ba5035a7..3698b68d77e 100644 --- a/src/emu/machine/ldv1000.c +++ b/src/emu/machine/ldv1000.c @@ -120,8 +120,8 @@ static WRITE8_DEVICE_HANDLER( ppi1_portc_w ); static ADDRESS_MAP_START( ldv1000_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x3800) AM_RAM - AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x9ff0) AM_DEVREADWRITE(PPI8255, "ldvppi0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x9ff0) AM_DEVREADWRITE(PPI8255, "ldvppi1", ppi8255_r, ppi8255_w) + AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x9ff0) AM_DEVREADWRITE("ldvppi0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x9ff0) AM_DEVREADWRITE("ldvppi1", ppi8255_r, ppi8255_w) ADDRESS_MAP_END @@ -130,7 +130,7 @@ static ADDRESS_MAP_START( ldv1000_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x07) AM_MIRROR(0x38) AM_READWRITE(decoder_display_port_r, decoder_display_port_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(controller_r) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_WRITE(controller_w) - AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x3c) AM_DEVREADWRITE(Z80CTC, "ldvctc", z80ctc_r, z80ctc_w) + AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x3c) AM_DEVREADWRITE("ldvctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END @@ -157,7 +157,7 @@ static const z80ctc_interface ctcintf = static const z80_daisy_chain daisy_chain[] = { - { Z80CTC, "ldvctc" }, + { "ldvctc" }, { NULL } }; @@ -231,8 +231,8 @@ static void ldv1000_init(laserdisc_state *ld) /* find our devices */ player->cpu = cputag_get_cpu(ld->device->machine, device_build_tag(tempstring, ld->device, "ldv1000")); - player->ctc = devtag_get_device(ld->device->machine, Z80CTC, device_build_tag(tempstring, ld->device, "ldvctc")); - player->multitimer = devtag_get_device(ld->device->machine, TIMER, device_build_tag(tempstring, ld->device, "multitimer")); + player->ctc = devtag_get_device(ld->device->machine, device_build_tag(tempstring, ld->device, "ldvctc")); + player->multitimer = devtag_get_device(ld->device->machine, device_build_tag(tempstring, ld->device, "multitimer")); timer_device_set_ptr(player->multitimer, ld); astring_free(tempstring); } diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c index 0c685a94f82..a1fdeb46ae1 100644 --- a/src/emu/machine/ldvp931.c +++ b/src/emu/machine/ldvp931.c @@ -215,7 +215,7 @@ static void vp931_init(laserdisc_state *ld) /* find our devices */ player->cpu = cputag_get_cpu(ld->device->machine, device_build_tag(tempstring, ld->device, "vp931")); - player->tracktimer = devtag_get_device(ld->device->machine, TIMER, device_build_tag(tempstring, ld->device, "tracktimer")); + player->tracktimer = devtag_get_device(ld->device->machine, device_build_tag(tempstring, ld->device, "tracktimer")); timer_device_set_ptr(player->tracktimer, ld); astring_free(tempstring); } diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h index 229ba67ad35..605bdffb0b7 100644 --- a/src/emu/machine/msm6242.h +++ b/src/emu/machine/msm6242.h @@ -19,7 +19,7 @@ MDRV_DEVICE_ADD(_tag, MSM6242, 0) #define MDRV_MSM6242_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, MSM6242) + MDRV_DEVICE_REMOVE(_tag) /* device interface */ diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c index 820abae29b0..109cf65e58a 100644 --- a/src/emu/machine/pci.c +++ b/src/emu/machine/pci.c @@ -218,7 +218,7 @@ static DEVICE_START( pci_bus ) /* find all our devices */ for (devicenum = 0; devicenum < ARRAY_LENGTH(pcibus->device); devicenum++) if (pcibus->config->device[devicenum].devtag != NULL) - pcibus->device[devicenum] = devtag_get_device(device->machine, pcibus->config->device[devicenum].devtype, pcibus->config->device[devicenum].devtag); + pcibus->device[devicenum] = devtag_get_device(device->machine, pcibus->config->device[devicenum].devtag); /* register pci states */ state_save_register_device_item(device, 0, pcibus->address); diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h index 7b075f7f3c9..b0226970f07 100644 --- a/src/emu/machine/pci.h +++ b/src/emu/machine/pci.h @@ -20,7 +20,6 @@ typedef void (*pci_write_func)(const device_config *pcibus, const device_config typedef struct _pci_device_entry pci_device_entry; struct _pci_device_entry { - device_type devtype; const char * devtag; pci_read_func read_callback; pci_write_func write_callback; @@ -43,8 +42,7 @@ struct _pci_bus_config MDRV_DEVICE_ADD(_tag, PCI_BUS, 0) \ MDRV_DEVICE_CONFIG_DATA32(pci_bus_config, busnum, _busnum) -#define MDRV_PCI_BUS_DEVICE(_devnum, _devtype, _devtag, _configread, _configwrite) \ - MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, devtype, _devtype) \ +#define MDRV_PCI_BUS_DEVICE(_devnum, _devtag, _configread, _configwrite) \ MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, devtag, _devtag) \ MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, read_callback, _configread) \ MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, write_callback, _configwrite) diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c index add7d134dd0..bf6dfa23ad1 100644 --- a/src/emu/machine/scsicd.c +++ b/src/emu/machine/scsicd.c @@ -693,7 +693,7 @@ static void scsicd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr #ifdef MESS /* TODO: get rid of this ifdef MESS section */ - our_this->cdrom = mess_cd_get_cdrom_file( device_list_find_by_tag( machine->config->devicelist, CDROM, diskregion ) ); + our_this->cdrom = mess_cd_get_cdrom_file( devtag_get_device( machine, diskregion ) ); #else our_this->cdrom = cdrom_open(get_disk_handle( diskregion )); diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c index ee6c10b9890..107c437bfcc 100644 --- a/src/emu/machine/scsihd.c +++ b/src/emu/machine/scsihd.c @@ -235,7 +235,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr #ifdef MESS /* TODO: get rid of this ifdef MESS section */ - our_this->disk = mess_hd_get_hard_disk_file( device_list_find_by_tag( machine->config->devicelist, HARDDISK, diskregion ) ); + our_this->disk = mess_hd_get_hard_disk_file( devtag_get_device( machine, diskregion ) ); #else our_this->disk = hard_disk_open(get_disk_handle( diskregion )); diff --git a/src/emu/machine/smc91c9x.h b/src/emu/machine/smc91c9x.h index 96836a046ba..9f924d6de6f 100644 --- a/src/emu/machine/smc91c9x.h +++ b/src/emu/machine/smc91c9x.h @@ -38,10 +38,10 @@ struct _smc91c9x_config MDRV_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback) #define MDRV_SMC91C94_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, SMC91C94) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_SMC91C96_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, SMC91C96) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h index ea761190d64..7a27f640175 100644 --- a/src/emu/machine/timekpr.h +++ b/src/emu/machine/timekpr.h @@ -25,7 +25,7 @@ DEVICE_GET_INFO(m48t02); MDRV_DEVICE_ADD(_tag, M48T02, 0) #define MDRV_M48T02_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, M48T02) + MDRV_DEVICE_REMOVE(_tag) #define M48T35 DEVICE_GET_INFO_NAME(m48t35) @@ -35,7 +35,7 @@ DEVICE_GET_INFO(m48t35); MDRV_DEVICE_ADD(_tag, M48T35, 0) #define MDRV_M48T35_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, M48T35) + MDRV_DEVICE_REMOVE(_tag) #define M48T58 DEVICE_GET_INFO_NAME(m48t58) @@ -45,7 +45,7 @@ DEVICE_GET_INFO(m48t58); MDRV_DEVICE_ADD(_tag, M48T58, 0) #define MDRV_M48T58_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, M48T58) + MDRV_DEVICE_REMOVE(_tag) #define MK48T08 DEVICE_GET_INFO_NAME(mk48t08) @@ -55,7 +55,7 @@ DEVICE_GET_INFO(mk48t08); MDRV_DEVICE_ADD(_tag, MK48T08, 0) #define MDRV_MK48T08_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, MK48T08) + MDRV_DEVICE_REMOVE(_tag) /* memory handlers */ diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h index bea4b32e8c5..31d47f86d97 100644 --- a/src/emu/machine/x2212.h +++ b/src/emu/machine/x2212.h @@ -21,7 +21,7 @@ DEVICE_GET_INFO(x2212); MDRV_DEVICE_ADD(_tag, X2212, 0) #define MDRV_X2212_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, X2212) + MDRV_DEVICE_REMOVE(_tag) extern void x2212_write( const device_config *device, int offset, int data ); diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h index 1d54da4fba0..0ddb06dec79 100644 --- a/src/emu/machine/z80ctc.h +++ b/src/emu/machine/z80ctc.h @@ -47,7 +47,7 @@ struct _z80ctc_interface MDRV_DEVICE_CONFIG(_intrf) #define MDRV_Z80CTC_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, Z80CTC) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h index 06ba14d00de..8f1c9fb8ebd 100644 --- a/src/emu/machine/z80dma.h +++ b/src/emu/machine/z80dma.h @@ -14,7 +14,7 @@ MDRV_DEVICE_CONFIG(_config) #define MDRV_Z80DMA_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, Z80DMA) + MDRV_DEVICE_REMOVE(_tag) typedef struct _z80dma_interface z80dma_interface; struct _z80dma_interface diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 37b2cc59958..c91695ae41d 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -61,7 +61,7 @@ struct _z80pio_interface MDRV_DEVICE_CONFIG(_intrf) #define MDRV_Z80PIO_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, Z80PIO) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h index 80f256ec4ae..77ffbf95f09 100644 --- a/src/emu/machine/z80sio.h +++ b/src/emu/machine/z80sio.h @@ -37,7 +37,7 @@ struct _z80sio_interface MDRV_DEVICE_CONFIG(_intrf) #define MDRV_Z80SIO_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, Z80SIO) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index b4cf1728cbe..f54878d11e9 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -36,9 +36,9 @@ static void machine_config_detokenize(machine_config *config, const machine_conf the given configuration -------------------------------------------------*/ -INLINE void remove_device(device_config **listheadptr, device_type type, const char *tag) +INLINE void remove_device(device_config **listheadptr, const char *tag) { - device_config *device = (device_config *)device_list_find_by_tag(*listheadptr, type, tag); + device_config *device = (device_config *)device_list_find_by_tag(*listheadptr, tag); device_custom_config_func custom; assert(device != NULL); @@ -49,7 +49,7 @@ INLINE void remove_device(device_config **listheadptr, device_type type, const c (*custom)(device, MCONFIG_TOKEN_DEVICE_CONFIG_CUSTOM_FREE, NULL); /* remove the device from the list */ - device_list_remove(listheadptr, type, tag); + device_list_remove(listheadptr, tag); } @@ -87,7 +87,7 @@ void machine_config_free(machine_config *config) { /* release the device list */ while (config->devicelist != NULL) - remove_device(&config->devicelist, config->devicelist->type, config->devicelist->tag); + remove_device(&config->devicelist, config->devicelist->tag); /* release the configuration itself */ free(config); @@ -138,18 +138,16 @@ static void machine_config_detokenize(machine_config *config, const machine_conf break; case MCONFIG_TOKEN_DEVICE_REMOVE: - devtype = TOKEN_GET_PTR(tokens, devtype); tag = TOKEN_GET_STRING(tokens); - remove_device(&config->devicelist, devtype, device_build_tag(tempstring, owner, tag)); + remove_device(&config->devicelist, device_build_tag(tempstring, owner, tag)); device = NULL; break; case MCONFIG_TOKEN_DEVICE_MODIFY: - devtype = TOKEN_GET_PTR(tokens, devtype); tag = TOKEN_GET_STRING(tokens); - device = (device_config *)device_list_find_by_tag(config->devicelist, devtype, device_build_tag(tempstring, owner, tag)); + device = (device_config *)device_list_find_by_tag(config->devicelist, device_build_tag(tempstring, owner, tag)); if (device == NULL) - fatalerror("Unable to find device: type=%s tag=%s\n", devtype_get_name(devtype), astring_c(tempstring)); + fatalerror("Unable to find device: tag=%s\n", astring_c(tempstring)); break; case MCONFIG_TOKEN_DEVICE_CLOCK: diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 3671a023051..6a2cadac025 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -291,14 +291,12 @@ union _machine_config_token TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define MDRV_DEVICE_REMOVE(_tag, _type) \ +#define MDRV_DEVICE_REMOVE(_tag) \ TOKEN_UINT32_PACK1(MCONFIG_TOKEN_DEVICE_REMOVE, 8), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define MDRV_DEVICE_MODIFY(_tag, _type) \ +#define MDRV_DEVICE_MODIFY(_tag) \ TOKEN_UINT32_PACK1(MCONFIG_TOKEN_DEVICE_MODIFY, 8), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), diff --git a/src/emu/memory.c b/src/emu/memory.c index 83a93621003..7bcd9ce7860 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1734,11 +1734,11 @@ static void memory_init_populate(running_machine *machine) { int bits = (entry->read_bits == 0) ? space->dbits : entry->read_bits; void *object = space; - if (entry->read_devtype != NULL) + if (entry->read_devtag != NULL) { - object = (void *)device_list_find_by_tag(machine->config->devicelist, entry->read_devtype, entry->read_devtag); + object = (void *)device_list_find_by_tag(machine->config->devicelist, entry->read_devtag); if (object == NULL) - fatalerror("Unidentified object in memory map: type=%s tag=%s\n", devtype_get_name(entry->read_devtype), entry->read_devtag); + fatalerror("Unidentified object in memory map: tag=%s\n", entry->read_devtag); } space_map_range_private(space, ROW_READ, bits, entry->read_mask, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, rhandler.generic, object, entry->read_name); } @@ -1748,11 +1748,11 @@ static void memory_init_populate(running_machine *machine) { int bits = (entry->write_bits == 0) ? space->dbits : entry->write_bits; void *object = space; - if (entry->write_devtype != NULL) + if (entry->write_devtag != NULL) { - object = (void *)device_list_find_by_tag(machine->config->devicelist, entry->write_devtype, entry->write_devtag); + object = (void *)device_list_find_by_tag(machine->config->devicelist, entry->write_devtag); if (object == NULL) - fatalerror("Unidentified object in memory map: type=%s tag=%s\n", devtype_get_name(entry->write_devtype), entry->write_devtag); + fatalerror("Unidentified object in memory map: tag=%s\n", entry->write_devtag); } space_map_range_private(space, ROW_WRITE, bits, entry->write_mask, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, whandler.generic, object, entry->write_name); } @@ -2099,7 +2099,6 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch TOKEN_GET_UINT32_UNPACK3(tokens, entrytype, 8, entry->read_bits, 8, entry->read_mask, 8); entry->read = TOKEN_GET_PTR(tokens, read); entry->read_name = TOKEN_GET_STRING(tokens); - entry->read_devtype = TOKEN_GET_PTR(tokens, devtype); if (entry->read_devtag_string == NULL) entry->read_devtag_string = astring_alloc(); entry->read_devtag = device_inherit_tag(entry->read_devtag_string, cputag, TOKEN_GET_STRING(tokens)); @@ -2111,7 +2110,6 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch TOKEN_GET_UINT32_UNPACK3(tokens, entrytype, 8, entry->write_bits, 8, entry->write_mask, 8); entry->write = TOKEN_GET_PTR(tokens, write); entry->write_name = TOKEN_GET_STRING(tokens); - entry->write_devtype = TOKEN_GET_PTR(tokens, devtype); if (entry->write_devtag_string == NULL) entry->write_devtag_string = astring_alloc(); entry->write_devtag = device_inherit_tag(entry->write_devtag_string, cputag, TOKEN_GET_STRING(tokens)); diff --git a/src/emu/memory.h b/src/emu/memory.h index 650474f22d3..b55d647ed39 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -221,14 +221,12 @@ struct _address_map_entry UINT8 read_bits; /* bits for the read handler callback (0=default, 1=8, 2=16, 3=32) */ UINT8 read_mask; /* mask bits indicating which subunits to process */ const char * read_name; /* read handler callback name */ - device_type read_devtype; /* read device type for device references */ const char * read_devtag; /* read tag for the relevant device */ const char * read_porttag; /* tag for input port reading */ write_handler write; /* write handler callback */ UINT8 write_bits; /* bits for the write handler callback (0=default, 1=8, 2=16, 3=32) */ UINT8 write_mask; /* mask bits indicating which subunits to process */ const char * write_name; /* write handler callback name */ - device_type write_devtype; /* read device type for device references */ const char * write_devtag; /* read tag for the relevant device */ UINT32 share; /* index of a shared memory block */ void ** baseptr; /* receives pointer to memory (optional) */ @@ -311,7 +309,6 @@ union _addrmap_token const addrmap_token * tokenptr; read_handler read; /* generic read handlers */ write_handler write; /* generic write handlers */ - device_type devtype; /* device type */ UINT8 ** memptr; /* memory pointer */ size_t * sizeptr; /* size pointer */ }; @@ -329,7 +326,6 @@ union _addrmap8_token write8_device_func dwrite; /* pointer to native device write handler */ read_handler read; /* generic read handlers */ write_handler write; /* generic write handlers */ - device_type devtype; /* device type */ UINT8 ** memptr; /* memory pointer */ size_t * sizeptr; /* size pointer */ }; @@ -351,7 +347,6 @@ union _addrmap16_token write8_device_func dwrite8; /* pointer to 8-bit device write handler */ read_handler read; /* generic read handlers */ write_handler write; /* generic write handlers */ - device_type devtype; /* device type */ UINT16 ** memptr; /* memory pointer */ size_t * sizeptr; /* size pointer */ }; @@ -377,7 +372,6 @@ union _addrmap32_token write16_device_func dwrite16; /* pointer to 16-bit device write handler */ read_handler read; /* generic read handlers */ write_handler write; /* generic write handlers */ - device_type devtype; /* device type */ UINT32 ** memptr; /* memory pointer */ size_t * sizeptr; /* size pointer */ }; @@ -407,7 +401,6 @@ union _addrmap64_token write32_device_func dwrite32; /* pointer to 32-bit device write handler */ read_handler read; /* generic read handlers */ write_handler write; /* generic write handlers */ - device_type devtype; /* device type */ UINT64 ** memptr; /* memory pointer */ size_t * sizeptr; /* size pointer */ }; @@ -724,60 +717,52 @@ union _addrmap64_token TOKEN_PTR(swrite32, _handler), \ TOKEN_STRING(#_handler), -#define AM_DEVREAD(_type, _tag, _handler) \ +#define AM_DEVREAD(_tag, _handler) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_READ, 8, 0, 8, 0, 8), \ TOKEN_PTR(dread, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVREAD8(_type, _tag, _handler, _unitmask) \ +#define AM_DEVREAD8(_tag, _handler, _unitmask) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_READ, 8, 8, 8, UNITMASK8(_unitmask), 8), \ TOKEN_PTR(dread8, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVREAD16(_type, _tag, _handler, _unitmask) \ +#define AM_DEVREAD16(_tag, _handler, _unitmask) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_READ, 8, 16, 8, UNITMASK16(_unitmask), 8), \ TOKEN_PTR(dread16, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVREAD32(_type, _tag, _handler, _unitmask) \ +#define AM_DEVREAD32(_tag, _handler, _unitmask) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_READ, 8, 32, 8, UNITMASK32(_unitmask), 8), \ TOKEN_PTR(dread32, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVWRITE(_type, _tag, _handler) \ +#define AM_DEVWRITE(_tag, _handler) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_WRITE, 8, 0, 8, 0, 8), \ TOKEN_PTR(dwrite, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVWRITE8(_type, _tag, _handler, _unitmask) \ +#define AM_DEVWRITE8(_tag, _handler, _unitmask) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_WRITE, 8, 8, 8, UNITMASK8(_unitmask), 8), \ TOKEN_PTR(dwrite8, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVWRITE16(_type, _tag, _handler, _unitmask) \ +#define AM_DEVWRITE16(_tag, _handler, _unitmask) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_WRITE, 8, 16, 8, UNITMASK16(_unitmask), 8), \ TOKEN_PTR(dwrite16, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), -#define AM_DEVWRITE32(_type, _tag, _handler, _unitmask) \ +#define AM_DEVWRITE32(_tag, _handler, _unitmask) \ TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_DEVICE_WRITE, 8, 32, 8, UNITMASK32(_unitmask), 8), \ TOKEN_PTR(dwrite32, _handler), \ TOKEN_STRING(#_handler), \ - TOKEN_PTR(devtype, _type), \ TOKEN_STRING(_tag), #define AM_READ_PORT(_tag) \ @@ -812,10 +797,10 @@ union _addrmap64_token #define AM_READWRITE16(_read,_write,_mask) AM_READ16(_read,_mask) AM_WRITE16(_write,_mask) #define AM_READWRITE32(_read,_write,_mask) AM_READ32(_read,_mask) AM_WRITE32(_write,_mask) -#define AM_DEVREADWRITE(_type,_tag,_read,_write) AM_DEVREAD(_type,_tag,_read) AM_DEVWRITE(_type,_tag,_write) -#define AM_DEVREADWRITE8(_type,_tag,_read,_write,_mask) AM_DEVREAD8(_type,_tag,_read,_mask) AM_DEVWRITE8(_type,_tag,_write,_mask) -#define AM_DEVREADWRITE16(_type,_tag,_read,_write,_mask) AM_DEVREAD16(_type,_tag,_read,_mask) AM_DEVWRITE16(_type,_tag,_write,_mask) -#define AM_DEVREADWRITE32(_type,_tag,_read,_write,_mask) AM_DEVREAD32(_type,_tag,_read,_mask) AM_DEVWRITE32(_type,_tag,_write,_mask) +#define AM_DEVREADWRITE(_tag,_read,_write) AM_DEVREAD(_tag,_read) AM_DEVWRITE(_tag,_write) +#define AM_DEVREADWRITE8(_tag,_read,_write,_mask) AM_DEVREAD8(_tag,_read,_mask) AM_DEVWRITE8(_tag,_write,_mask) +#define AM_DEVREADWRITE16(_tag,_read,_write,_mask) AM_DEVREAD16(_tag,_read,_mask) AM_DEVWRITE16(_tag,_write,_mask) +#define AM_DEVREADWRITE32(_tag,_read,_write,_mask) AM_DEVREAD32(_tag,_read,_mask) AM_DEVWRITE32(_tag,_write,_mask) #define AM_ROM AM_READ(SMH_ROM) #define AM_ROMBANK(_bank) AM_READ(SMH_BANK(_bank)) diff --git a/src/emu/sound.c b/src/emu/sound.c index 6918e52b404..69c1d736bc1 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -432,8 +432,8 @@ static void route_sound(running_machine *machine) /* iterate over all routes */ for (route = config->routelist; route != NULL; route = route->next) { - const device_config *target_speaker = devtag_get_device(machine, SPEAKER_OUTPUT, route->target); - const device_config *target_sound = devtag_get_device(machine, SOUND, route->target); + const device_config *target_speaker = devtag_get_device(machine, route->target); + const device_config *target_sound = devtag_get_device(machine, route->target); /* if neither found, it's fatal */ if (target_speaker == NULL && target_sound == NULL) @@ -470,8 +470,8 @@ static void route_sound(running_machine *machine) /* iterate over all routes */ for (route = config->routelist; route != NULL; route = route->next) { - const device_config *target_speaker = devtag_get_device(machine, SPEAKER_OUTPUT, route->target); - const device_config *target_sound = devtag_get_device(machine, SOUND, route->target); + const device_config *target_speaker = devtag_get_device(machine, route->target); + const device_config *target_sound = devtag_get_device(machine, route->target); int inputnum = route->input; sound_stream *stream; int streamoutput; diff --git a/src/emu/sound.h b/src/emu/sound.h index d910125cd39..c5ebcb5c659 100644 --- a/src/emu/sound.h +++ b/src/emu/sound.h @@ -91,10 +91,10 @@ struct _speaker_config MDRV_DEVICE_CONFIG_DATAPTR(sound_config, type, SOUND_##_type) #define MDRV_SOUND_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, SOUND) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_SOUND_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag, SOUND) + MDRV_DEVICE_MODIFY(_tag) #define MDRV_SOUND_TYPE(_type) \ MDRV_DEVICE_CONFIG_DATAPTR(sound_config, type, SOUND_##_type) @@ -103,7 +103,7 @@ struct _speaker_config MDRV_DEVICE_CLOCK(_clock) #define MDRV_SOUND_REPLACE(_tag, _type, _clock) \ - MDRV_DEVICE_MODIFY(_tag, SOUND) \ + MDRV_DEVICE_MODIFY(_tag) \ MDRV_DEVICE_CONFIG_CLEAR() \ MDRV_DEVICE_CONFIG_DATAPTR(sound_config, type, SOUND_##_type) \ MDRV_DEVICE_CLOCK(_clock) \ @@ -133,7 +133,7 @@ struct _speaker_config MDRV_DEVICE_CONFIG_DATAFP32(speaker_config, z, _z, 24) #define MDRV_SPEAKER_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, SPEAKER_OUTPUT) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_SPEAKER_STANDARD_MONO(_tag) \ MDRV_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0) diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c index 01b9f2929e3..947bc217445 100644 --- a/src/emu/sound/cdp1869.c +++ b/src/emu/sound/cdp1869.c @@ -865,7 +865,7 @@ static DEVICE_START( cdp1869 ) cdp1869->wnoff = 1; /* get the screen device */ - cdp1869->screen = devtag_get_device(device->machine, VIDEO_SCREEN, cdp1869->intf->screen_tag); + cdp1869->screen = devtag_get_device(device->machine, cdp1869->intf->screen_tag); assert(cdp1869->screen != NULL); /* get the CPU device */ diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h index 1041632b828..40fdb841788 100644 --- a/src/emu/sound/cdp1869.h +++ b/src/emu/sound/cdp1869.h @@ -93,7 +93,7 @@ MDRV_DEVICE_CONFIG(_config) #define MDRV_CDP1869_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, SOUND) + MDRV_DEVICE_REMOVE(_tag) #define CDP1869_INTERFACE(_name) const cdp1869_interface (_name) = diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index 99b45a1384c..946e0080dd5 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -951,7 +951,7 @@ READ8_HANDLER( quad_pokey_r ) int control = (offset & 0x20) >> 2; int pokey_reg = (offset % 8) | control; - return pokey_r(devtag_get_device(space->machine, SOUND, devname[pokey_num]), pokey_reg); + return pokey_r(devtag_get_device(space->machine, devname[pokey_num]), pokey_reg); } @@ -1337,7 +1337,7 @@ WRITE8_HANDLER( quad_pokey_w ) int control = (offset & 0x20) >> 2; int pokey_reg = (offset % 8) | control; - pokey_w(devtag_get_device(space->machine, SOUND, devname[pokey_num]), pokey_reg, data); + pokey_w(devtag_get_device(space->machine, devname[pokey_num]), pokey_reg, data); } void pokey_serin_ready(const device_config *device, int after) diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c index 206aa5a8016..da1f6d592b1 100644 --- a/src/emu/sound/psx.c +++ b/src/emu/sound/psx.c @@ -226,7 +226,7 @@ static STREAM_UPDATE( PSXSPU_update ) static void spu_read( running_machine *machine, UINT32 n_address, INT32 n_size ) { - struct psxinfo *chip = get_safe_token(devtag_get_device(machine, SOUND, "spu")); + struct psxinfo *chip = get_safe_token(devtag_get_device(machine, "spu")); verboselog( machine, 1, "spu_read( %08x, %08x )\n", n_address, n_size ); while( n_size > 0 ) @@ -245,7 +245,7 @@ static void spu_read( running_machine *machine, UINT32 n_address, INT32 n_size ) static void spu_write( running_machine *machine, UINT32 n_address, INT32 n_size ) { - struct psxinfo *chip = get_safe_token(devtag_get_device(machine, SOUND, "spu")); + struct psxinfo *chip = get_safe_token(devtag_get_device(machine, "spu")); verboselog( machine, 1, "spu_write( %08x, %08x )\n", n_address, n_size ); while( n_size > 0 ) diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 765fe91b701..e8a03156466 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -727,7 +727,7 @@ static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg) break; case 0x6: case 0x7: - scsp_midi_in(devtag_get_device(space->machine, SOUND, "scsp"), 0, SCSP->udata.data[0x6/2]&0xff, 0); + scsp_midi_in(devtag_get_device(space->machine, "scsp"), 0, SCSP->udata.data[0x6/2]&0xff, 0); break; case 0x12: case 0x13: diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c index 78540a68a86..79083244c66 100644 --- a/src/emu/sound/wave.c +++ b/src/emu/sound/wave.c @@ -60,7 +60,7 @@ static DEVICE_START( wave ) const device_config *image = NULL; #ifdef MESS - image = device_list_find_by_tag( device->machine->config->devicelist, CASSETTE, device->tag ); + image = devtag_get_device( device->machine, device->tag ); #endif stream_create(device, 0, 1, device->machine->sample_rate, (void *)image, wave_sound_update); } diff --git a/src/emu/streams.c b/src/emu/streams.c index 0f13eb9b2a4..639586d8089 100644 --- a/src/emu/streams.c +++ b/src/emu/streams.c @@ -920,7 +920,7 @@ static stream_sample_t *generate_resampled_data(stream_input *input, UINT32 nums source = output->buffer + (basesample - input_stream->output_base_sampindex); /* determine the current fraction of a sample */ - basefrac = (basetime - basesample * input_stream->attoseconds_per_sample) / (input_stream->attoseconds_per_sample >> FRAC_BITS); + basefrac = (basetime - basesample * input_stream->attoseconds_per_sample) / ((input_stream->attoseconds_per_sample + FRAC_ONE - 1) >> FRAC_BITS); assert(basefrac >= 0); assert(basefrac < FRAC_ONE); diff --git a/src/emu/timer.c b/src/emu/timer.c index c94bc45dc69..e6e7ae3b935 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -1079,7 +1079,7 @@ static TIMER_CALLBACK( scanline_timer_device_timer_callback ) timer_config *config = timer->inline_config; /* get the screen device and verify it */ - const device_config *screen = device_list_find_by_tag(timer->machine->config->devicelist, VIDEO_SCREEN, config->screen); + const device_config *screen = devtag_get_device(timer->machine, config->screen); assert(screen != NULL); /* first time, start with the first scanline, but do not call the callback */ diff --git a/src/emu/timer.h b/src/emu/timer.h index e4e8a4f254d..e6e07bb8ef7 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -132,10 +132,10 @@ struct _timer_execution_state MDRV_DEVICE_CONFIG_DATA32(timer_config, increment, _increment) #define MDRV_TIMER_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, TIMER_SCREEN) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_TIMER_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag, TIMER_SCREEN) + MDRV_DEVICE_MODIFY(_tag) #define MDRV_TIMER_CALLBACK(_callback) \ MDRV_DEVICE_CONFIG_DATAPTR(timer_config, callback, _callback) diff --git a/src/emu/validity.c b/src/emu/validity.c index 49cb71f625c..dc3414b1148 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -841,14 +841,14 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p } /* make sure all devices exist */ - if (entry->read_devtype != NULL && device_list_find_by_tag(config->devicelist, entry->read_devtype, entry->read_devtag) == NULL) + if (entry->read_devtag != NULL && device_list_find_by_tag(config->devicelist, entry->read_devtag) == NULL) { - mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant device %s '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], devtype_get_name(entry->read_devtype), entry->read_devtag); + mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant device '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->read_devtag); error = TRUE; } - if (entry->write_devtype != NULL && device_list_find_by_tag(config->devicelist, entry->write_devtype, entry->write_devtag) == NULL) + if (entry->write_devtag != NULL && device_list_find_by_tag(config->devicelist, entry->write_devtag) == NULL) { - mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant device %s '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], devtype_get_name(entry->write_devtype), entry->write_devtag); + mame_printf_error("%s: %s CPU '%s' %s space memory map entry references nonexistant device '%s'\n", driver->source_file, driver->name, device->tag, address_space_names[spacenum], entry->write_devtag); error = TRUE; } @@ -876,7 +876,7 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p mame_printf_error("%s: %s cpu '%s' has a new VBLANK interrupt handler with >1 interrupts!\n", driver->source_file, driver->name, device->tag); error = TRUE; } - else if (cpuconfig->vblank_interrupt_screen != NULL && device_list_find_by_tag(config->devicelist, VIDEO_SCREEN, cpuconfig->vblank_interrupt_screen) == NULL) + else if (cpuconfig->vblank_interrupt_screen != NULL && device_list_find_by_tag(config->devicelist, cpuconfig->vblank_interrupt_screen) == NULL) { mame_printf_error("%s: %s cpu '%s' VBLANK interrupt with a non-existant screen tag (%s)!\n", driver->source_file, driver->name, device->tag, cpuconfig->vblank_interrupt_screen); error = TRUE; diff --git a/src/emu/video.h b/src/emu/video.h index 41ec2992715..f86269739ef 100644 --- a/src/emu/video.h +++ b/src/emu/video.h @@ -100,10 +100,10 @@ typedef void (*vblank_state_changed_func)(const device_config *device, void *par MDRV_DEVICE_CONFIG_DATA32(screen_config, type, SCREEN_TYPE_##_type) #define MDRV_SCREEN_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, VIDEO_SCREEN) + MDRV_DEVICE_REMOVE(_tag) #define MDRV_SCREEN_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag, VIDEO_SCREEN) + MDRV_DEVICE_MODIFY(_tag) #define MDRV_SCREEN_FORMAT(_format) \ MDRV_DEVICE_CONFIG_DATA32(screen_config, format, _format) diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c index 155876174b8..429e91161db 100644 --- a/src/emu/video/mc6845.c +++ b/src/emu/video/mc6845.c @@ -759,7 +759,7 @@ static void common_start(const device_config *device, int device_type) mc6845->hpixels_per_column = mc6845->intf->hpixels_per_column; /* get the screen device */ - mc6845->screen = device_list_find_by_tag(device->machine->config->devicelist, VIDEO_SCREEN, mc6845->intf->screen_tag); + mc6845->screen = devtag_get_device(device->machine, mc6845->intf->screen_tag); assert(mc6845->screen != NULL); /* create the timers */ diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h index c759135312d..a7dc15c9bd7 100644 --- a/src/emu/video/mc6845.h +++ b/src/emu/video/mc6845.h @@ -24,8 +24,8 @@ MDRV_DEVICE_ADD(_tag, _variant, _clock) \ MDRV_DEVICE_CONFIG(_config) -#define MDRV_MC6845_REMOVE(_tag, _variant) \ - MDRV_DEVICE_REMOVE(_tag, _variant) +#define MDRV_MC6845_REMOVE(_tag) \ + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c index fa40ac34f84..0edc524fd33 100644 --- a/src/emu/video/tms34061.c +++ b/src/emu/video/tms34061.c @@ -80,7 +80,7 @@ void tms34061_start(running_machine *machine, const struct tms34061_interface *i /* reset the data */ memset(&tms34061, 0, sizeof(tms34061)); tms34061.intf = *interface; - tms34061.screen = device_list_find_by_tag(machine->config->devicelist, VIDEO_SCREEN, tms34061.intf.screen_tag); + tms34061.screen = devtag_get_device(machine, tms34061.intf.screen_tag); tms34061.vrammask = tms34061.intf.vramsize - 1; /* allocate memory for VRAM */ diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index 504312ab2fc..89048353d04 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -4540,7 +4540,7 @@ static DEVICE_START( voodoo ) /* set the type, and initialize the chip mask */ v->index = device_list_index(device->machine->config->devicelist, device->type, device->tag); - v->screen = devtag_get_device(device->machine, VIDEO_SCREEN, config->screen); + v->screen = devtag_get_device(device->machine, config->screen); assert_always(v->screen != NULL, "Unable to find screen attached to voodoo"); v->cpu = cputag_get_cpu(device->machine, config->cputag); assert_always(v->cpu != NULL, "Unable to find CPU attached to voodoo"); diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h index 2e5de98cd03..a32e7eb9792 100644 --- a/src/emu/video/voodoo.h +++ b/src/emu/video/voodoo.h @@ -86,10 +86,10 @@ struct _voodoo_config MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, cputag, _cputag) #define MDRV_3DFX_VOODOO_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag, VOODOO_GRAPHICS) + MDRV_DEVICE_MODIFY(_tag) #define MDRV_3DFX_VOODOO_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, VOODOO_GRAPHICS) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c index fbdd32ac602..a06d666782c 100644 --- a/src/mame/audio/8080bw.c +++ b/src/mame/audio/8080bw.c @@ -39,8 +39,8 @@ MACHINE_START( extra_8080bw_sh ) WRITE8_HANDLER( invadpt2_sh_port_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *sn = devtag_get_device(space->machine, "sn"); UINT8 rising_bits = data & ~port_1_last_extra; sn76477_enable_w(sn, !(data & 0x01)); /* SAUCER SOUND */ @@ -67,7 +67,7 @@ WRITE8_HANDLER( invadpt2_sh_port_2_w ) D2 = 82K D3 = 100K */ - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last_extra; if (rising_bits & 0x01) sample_start(samples, 4, 3, 0); /* FLEET */ @@ -90,9 +90,9 @@ WRITE8_HANDLER( invadpt2_sh_port_2_w ) WRITE8_HANDLER( spcewars_sh_port_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *speaker = devtag_get_device(space->machine, SOUND, "speaker"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *speaker = devtag_get_device(space->machine, "speaker"); + const device_config *sn = devtag_get_device(space->machine, "sn"); UINT8 rising_bits = data & ~port_1_last_extra; sn76477_enable_w(sn, !(data & 0x01)); /* Saucer Sound */ @@ -136,7 +136,7 @@ const samples_interface lrescue_samples_interface = WRITE8_HANDLER( lrescue_sh_port_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 0, 3, 0); /* Thrust */ @@ -154,8 +154,8 @@ WRITE8_HANDLER( lrescue_sh_port_1_w ) WRITE8_HANDLER( lrescue_sh_port_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *speaker = devtag_get_device(space->machine, SOUND, "speaker"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *speaker = devtag_get_device(space->machine, "speaker"); UINT8 rising_bits = data & ~port_2_last_extra; if (rising_bits & 0x01) sample_start(samples, 1, 8, 0); /* Footstep high tone */ @@ -195,7 +195,7 @@ WRITE8_HANDLER( cosmo_sh_port_2_w ) WRITE8_HANDLER( ballbomb_sh_port_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 1, 2, 0); /* Hit a balloon */ @@ -213,7 +213,7 @@ WRITE8_HANDLER( ballbomb_sh_port_1_w ) WRITE8_HANDLER( ballbomb_sh_port_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last_extra; if (data & 0x01) sample_start(samples, 0, 7, 0); /* Indicates plane will drop bombs */ @@ -273,7 +273,7 @@ WRITE8_HANDLER( indianbt_sh_port_1_w ) { /* bit 4 occurs every 5.25 seconds during gameplay */ - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 1, 7, 0); /* Death */ @@ -290,7 +290,7 @@ WRITE8_HANDLER( indianbt_sh_port_1_w ) WRITE8_HANDLER( indianbt_sh_port_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last_extra; if (rising_bits & 0x01) sample_start(samples, 4, 0, 0); /* Bird dropped an egg, Lasso used */ @@ -799,8 +799,8 @@ static const double schaser_effect_rc[8] = WRITE8_HANDLER( schaser_sh_port_1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); + const device_config *sn = devtag_get_device(space->machine, "sn"); static int last_effect = 0; int effect; @@ -874,7 +874,7 @@ WRITE8_HANDLER( schaser_sh_port_2_w ) bit 4 - Field Control B (SX10) bit 5 - Flip Screen */ - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); printf( "schaser_sh_port_2_w: %02x\n", data ); @@ -895,7 +895,7 @@ WRITE8_HANDLER( schaser_sh_port_2_w ) static TIMER_CALLBACK( schaser_effect_555_cb ) { - const device_config *sn = devtag_get_device(machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(machine, "sn"); int effect = param; attotime new_time; /* Toggle 555 output */ @@ -963,7 +963,7 @@ MACHINE_RESET( schaser ) WRITE8_HANDLER( rollingc_sh_port_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_3_last_extra; if (rising_bits & 0x02) sample_start(samples, 4, 0, 0); /* Steering */ @@ -987,7 +987,7 @@ WRITE8_HANDLER( rollingc_sh_port_w ) WRITE8_HANDLER( invrvnge_sh_port_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); switch (data) { case 0x06: @@ -1031,8 +1031,8 @@ WRITE8_HANDLER( invrvnge_sh_port_w ) WRITE8_HANDLER( lupin3_sh_port_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *sn = devtag_get_device(space->machine, "sn"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 0, 6, 0); /* Walking, get money */ @@ -1048,7 +1048,7 @@ WRITE8_HANDLER( lupin3_sh_port_1_w ) WRITE8_HANDLER( lupin3_sh_port_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last_extra; if (rising_bits & 0x01) sample_start(samples, 0, 3, 0); /* Lands on top of building, wife kicks man */ @@ -1075,7 +1075,7 @@ WRITE8_HANDLER( schasrcv_sh_port_1_w ) bit 3 = 1st speedup Death is a stream of ff's with some fe's thrown in */ - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x02) sample_start(samples, 1, 6, 0); /* Ran over a dot */ @@ -1086,7 +1086,7 @@ WRITE8_HANDLER( schasrcv_sh_port_1_w ) WRITE8_HANDLER( schasrcv_sh_port_2_w ) { - const device_config *speaker = devtag_get_device(space->machine, SOUND, "speaker"); + const device_config *speaker = devtag_get_device(space->machine, "speaker"); speaker_level_w(speaker, (data & 0x01) ? 1 : 0); /* End-of-Level */ @@ -1103,7 +1103,7 @@ WRITE8_HANDLER( schasrcv_sh_port_2_w ) WRITE8_HANDLER( yosakdon_sh_port_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 0, 3, 0); /* Game Over */ @@ -1119,8 +1119,8 @@ WRITE8_HANDLER( yosakdon_sh_port_1_w ) WRITE8_HANDLER( yosakdon_sh_port_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *sn = devtag_get_device(space->machine, "sn"); UINT8 rising_bits = data & ~port_2_last_extra; if (rising_bits & 0x01) sample_start(samples, 1, 6, 0); /* Ready? , Game Over */ @@ -1145,8 +1145,8 @@ WRITE8_HANDLER( shuttlei_sh_port_1_w ) { /* bit 3 is high while you are alive and playing */ - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *sn = devtag_get_device(space->machine, "sn"); UINT8 rising_bits = data & ~port_1_last_extra; if (rising_bits & 0x01) sample_start(samples, 4, 4, 0); /* Fleet move */ @@ -1159,7 +1159,7 @@ WRITE8_HANDLER( shuttlei_sh_port_1_w ) WRITE8_HANDLER( shuttlei_sh_port_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); switch (data) { case 0x23: diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c index 0da20817a26..38e4704458b 100644 --- a/src/mame/audio/astrof.c +++ b/src/mame/audio/astrof.c @@ -68,7 +68,7 @@ MACHINE_START( astrof_audio ) WRITE8_HANDLER( astrof_audio_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last; if (astrof_death_playing) @@ -114,7 +114,7 @@ WRITE8_HANDLER( astrof_audio_1_w ) WRITE8_HANDLER( astrof_audio_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last; /* D0-D2 - explosion select (triggered by D2 of the other port */ @@ -219,7 +219,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( tomahawk_audio_w ) { - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(space->machine, "sn"); /* D0 - sonar */ diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 992973f5d6b..b0ad22e693a 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -121,12 +121,12 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask) bank_source_data = &rgn[0x10000]; /* determine which sound hardware is installed */ - tms5220 = devtag_get_device(machine, SOUND, "tms"); - ym2151 = devtag_get_device(machine, SOUND, "ym"); - pokey = devtag_get_device(machine, SOUND, "pokey"); - oki6295 = devtag_get_device(machine, SOUND, "adpcm"); - oki6295_l = devtag_get_device(machine, SOUND, "adpcml"); - oki6295_r = devtag_get_device(machine, SOUND, "adpcmr"); + tms5220 = devtag_get_device(machine, "tms"); + ym2151 = devtag_get_device(machine, "ym"); + pokey = devtag_get_device(machine, "pokey"); + oki6295 = devtag_get_device(machine, "adpcm"); + oki6295_l = devtag_get_device(machine, "adpcml"); + oki6295_r = devtag_get_device(machine, "adpcmr"); /* install POKEY memory handlers */ if (pokey != NULL) @@ -653,7 +653,7 @@ static WRITE8_HANDLER( jsa3s_io_w ) /* update the OKI bank */ oki6295_bank_base = (0x40000 * ((data >> 1) & 1)) | (oki6295_bank_base & 0x80000); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "adpcml"), oki6295_bank_base); + okim6295_set_bank_base(devtag_get_device(space->machine, "adpcml"), oki6295_bank_base); /* update the bank */ memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000); @@ -679,8 +679,8 @@ static WRITE8_HANDLER( jsa3s_io_w ) /* update the OKI bank */ oki6295_bank_base = (0x80000 * ((data >> 4) & 1)) | (oki6295_bank_base & 0x40000); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "adpcml"), oki6295_bank_base); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "adpcmr"), 0x40000 * (data >> 6)); + okim6295_set_bank_base(devtag_get_device(space->machine, "adpcml"), oki6295_bank_base); + okim6295_set_bank_base(devtag_get_device(space->machine, "adpcmr"), 0x40000 * (data >> 6)); /* update the volumes */ ym2151_volume = ((data >> 1) & 7) * 100 / 7; @@ -716,7 +716,7 @@ static void update_all_volumes(running_machine *machine ) static ADDRESS_MAP_START( atarijsa1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa1_io_r, jsa1_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -724,7 +724,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atarijsa2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa2_io_r, jsa2_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -733,7 +733,7 @@ ADDRESS_MAP_END /* full map verified from schematics and Batman GALs */ static ADDRESS_MAP_START( atarijsa3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3_io_r, jsa3_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -741,7 +741,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atarijsa3s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3s_io_r, jsa3s_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/audio/blockade.c b/src/mame/audio/blockade.c index 011021f71f2..da04a5e01f9 100644 --- a/src/mame/audio/blockade.c +++ b/src/mame/audio/blockade.c @@ -44,7 +44,7 @@ WRITE8_DEVICE_HANDLER( blockade_sound_freq_w ) WRITE8_HANDLER( blockade_env_on_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); if (BLOCKADE_LOG) mame_printf_debug("Boom Start\n"); sample_start(samples, 0,0,0); return; diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 03fc9993926..b040cab588f 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -178,7 +178,7 @@ void cage_init(running_machine *machine, offs_t speedup) { char buffer[10]; sprintf(buffer, "dac%d", chan + 1); - dmadac[chan] = devtag_get_device(machine, SOUND, buffer); + dmadac[chan] = devtag_get_device(machine, buffer); } state_save_register_global(machine, cpu_to_cage_ready); diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c index 8c8347dfa75..b749195b75a 100644 --- a/src/mame/audio/carnival.c +++ b/src/mame/audio/carnival.c @@ -128,7 +128,7 @@ static int psgData = 0; WRITE8_HANDLER( carnival_audio_1_w ) { static int port1State = 0; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; int bitsGoneHigh; int bitsGoneLow; @@ -207,7 +207,7 @@ WRITE8_HANDLER( carnival_audio_1_w ) WRITE8_HANDLER( carnival_audio_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; int bitsGoneHigh; int bitsGoneLow; @@ -293,7 +293,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( carnival_audio_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(carnival_music_port_t1_r) AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(carnival_music_port_1_w) - AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE(SOUND, "psg", carnival_music_port_2_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE("psg", carnival_music_port_2_w) ADDRESS_MAP_END diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c index 5bf15cdd0ce..b2c04b4dbc4 100644 --- a/src/mame/audio/cchasm.c +++ b/src/mame/audio/cchasm.c @@ -95,7 +95,7 @@ static WRITE8_DEVICE_HANDLER( ctc_timer_1_w ) { output[0] ^= 0x7f; channel_active[0] = 1; - dac_data_w(devtag_get_device(device->machine, SOUND, "dac1"), output[0]); + dac_data_w(devtag_get_device(device->machine, "dac1"), output[0]); } } @@ -105,7 +105,7 @@ static WRITE8_DEVICE_HANDLER( ctc_timer_2_w ) { output[1] ^= 0x7f; channel_active[1] = 1; - dac_data_w(devtag_get_device(device->machine, SOUND, "dac2"), output[0]); + dac_data_w(devtag_get_device(device->machine, "dac2"), output[0]); } } @@ -129,7 +129,7 @@ SOUND_START( cchasm ) sound_flags = 0; output[0] = 0; output[1] = 0; - ctc = devtag_get_device(machine, Z80CTC, "ctc"); + ctc = devtag_get_device(machine, "ctc"); timer_pulse(machine, video_screen_get_frame_period(machine->primary_screen), NULL, 0, cchasm_sh_update); } diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c index b7afaed66d1..a296ac5aad5 100644 --- a/src/mame/audio/cclimber.c +++ b/src/mame/audio/cclimber.c @@ -27,7 +27,7 @@ static void cclimber_play_sample(running_machine *machine, int start,int freq,in int len; int romlen = memory_region_length(machine, "samples"); const UINT8 *rom = memory_region(machine, "samples"); - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); if (!rom) return; diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c index 0699fa52b34..4828ab0dc34 100644 --- a/src/mame/audio/cinemat.c +++ b/src/mame/audio/cinemat.c @@ -161,7 +161,7 @@ static const samples_interface spacewar_samples_interface = static void spacewar_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* Explosion - rising edge */ if (SOUNDVAL_RISING_EDGE(0x01)) @@ -240,7 +240,7 @@ static const samples_interface barrier_samples_interface = static void barrier_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* Player die - rising edge */ if (SOUNDVAL_RISING_EDGE(0x01)) @@ -293,7 +293,7 @@ static const samples_interface speedfrk_samples_interface = static void speedfrk_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* on the falling edge of bit 0x08, clock the inverse of bit 0x04 into the top of the shiftreg */ if (SOUNDVAL_FALLING_EDGE(0x08)) @@ -358,7 +358,7 @@ static const samples_interface starhawk_samples_interface = static void starhawk_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* explosion - falling edge */ if (SOUNDVAL_FALLING_EDGE(0x01)) @@ -434,7 +434,7 @@ static const samples_interface sundance_samples_interface = static void sundance_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* bong - falling edge */ if (SOUNDVAL_FALLING_EDGE(0x01)) @@ -507,7 +507,7 @@ static void tailg_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_ /* the falling edge of bit 0x10 clocks bit 0x08 into the mux selected by bits 0x07 */ if (SOUNDVAL_FALLING_EDGE(0x10)) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* update the shift register (actually just a simple mux) */ current_shift = (current_shift & ~(1 << (sound_val & 7))) | (((sound_val >> 3) & 1) << (sound_val & 7)); @@ -592,7 +592,7 @@ static const samples_interface warrior_samples_interface = static void warrior_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* normal level - 0=on, 1=off */ if (SOUNDVAL_FALLING_EDGE(0x01)) @@ -663,7 +663,7 @@ static const samples_interface armora_samples_interface = static void armora_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ if (SOUNDVAL_RISING_EDGE(0x10)) @@ -764,7 +764,7 @@ static const samples_interface ripoff_samples_interface = static void ripoff_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* on the rising edge of bit 0x02, clock bit 0x01 into the shift register */ if (SOUNDVAL_RISING_EDGE(0x02)) @@ -851,7 +851,7 @@ static const samples_interface starcas_samples_interface = static void starcas_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); UINT32 target_pitch; /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ @@ -964,7 +964,7 @@ static const samples_interface solarq_samples_interface = static void solarq_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); static float target_volume, current_volume; /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ @@ -1104,7 +1104,7 @@ static const samples_interface boxingb_samples_interface = static void boxingb_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ if (SOUNDVAL_RISING_EDGE(0x10)) @@ -1235,7 +1235,7 @@ static const samples_interface wotw_samples_interface = static void wotw_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); UINT32 target_pitch; /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ @@ -1348,7 +1348,7 @@ static const samples_interface wotwc_samples_interface = static void wotwc_sound_w(running_machine *machine, UINT8 sound_val, UINT8 bits_changed) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); UINT32 target_pitch; /* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */ @@ -1542,33 +1542,33 @@ static MACHINE_RESET( demon_sound ) last_portb_write = 0xff; /* turn off channel A on AY8910 #0 because it is used as a low-pass filter */ - ay8910_set_volume(devtag_get_device(machine, SOUND, "ay1"), 0, 0); + ay8910_set_volume(devtag_get_device(machine, "ay1"), 0, 0); } static ADDRESS_MAP_START( demon_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x3000, 0x33ff) AM_RAM - AM_RANGE(0x4000, 0x4001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x4002, 0x4003) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x5000, 0x5001) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x5002, 0x5003) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x6000, 0x6001) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0x6002, 0x6003) AM_DEVWRITE(SOUND, "ay3", ay8910_data_address_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x4002, 0x4003) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x5000, 0x5001) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x5002, 0x5003) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x6000, 0x6001) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0x6002, 0x6003) AM_DEVWRITE("ay3", ay8910_data_address_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) /* watchdog? */ ADDRESS_MAP_END static ADDRESS_MAP_START( demon_sound_ports, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVWRITE(Z80CTC, "ctc", z80ctc_w) - AM_RANGE(0x1c, 0x1f) AM_DEVWRITE(Z80CTC, "ctc", z80ctc_w) + AM_RANGE(0x00, 0x03) AM_DEVWRITE("ctc", z80ctc_w) + AM_RANGE(0x1c, 0x1f) AM_DEVWRITE("ctc", z80ctc_w) ADDRESS_MAP_END static const z80_daisy_chain daisy_chain[] = { - { Z80CTC, "ctc" }, + { "ctc" }, { NULL } }; diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c index 6dead6b213d..1f39f5ff11b 100644 --- a/src/mame/audio/circus.c +++ b/src/mame/audio/circus.c @@ -174,8 +174,8 @@ DISCRETE_SOUND_END WRITE8_HANDLER( circus_clown_z_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); clown_z = (data & 0x0f); *(memory_region(space->machine, "maincpu")+0x8000)=data; logerror("Z:%02x\n",data); //DEBUG diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index 2456a492c94..76790a2c35b 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -64,7 +64,7 @@ WRITE8_HANDLER( cyberbal_sound_bank_select_w ) coin_counter_w(1, (data >> 5) & 1); coin_counter_w(0, (data >> 4) & 1); cpu_set_input_line(space->machine->cpu[3], INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); - if (!(data & 0x01)) devtag_reset(space->machine, SOUND, "ym"); + if (!(data & 0x01)) devtag_reset(space->machine, "ym"); } @@ -146,7 +146,7 @@ WRITE16_HANDLER( cyberbal_sound_68k_w ) WRITE16_HANDLER( cyberbal_sound_68k_dac_w ) { - const device_config *dac = devtag_get_device(space->machine, SOUND, (offset & 8) ? "dac2" : "dac1"); + const device_config *dac = devtag_get_device(space->machine, (offset & 8) ? "dac2" : "dac1"); dac_data_16_w(dac, (((data >> 3) & 0x800) | ((data >> 2) & 0x7ff)) << 4); if (fast_68k_int) diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index f11d9c64cc8..cfa6c4a383f 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -934,7 +934,7 @@ void dcs_init(running_machine *machine) dcs.data = cpu_get_address_space(dcs.cpu, ADDRESS_SPACE_DATA); dcs.rev = 1; dcs.channels = 1; - dcs.dmadac[0] = devtag_get_device(machine, SOUND, "dac"); + dcs.dmadac[0] = devtag_get_device(machine, "dac"); /* configure boot and sound ROMs */ dcs.bootrom = (UINT16 *)memory_region(machine, "dcs"); @@ -984,8 +984,8 @@ void dcs2_init(running_machine *machine, int dram_in_mb, offs_t polling_offset) dcs.program = cpu_get_address_space(dcs.cpu, ADDRESS_SPACE_PROGRAM); dcs.data = cpu_get_address_space(dcs.cpu, ADDRESS_SPACE_DATA); dcs.channels = 2; - dcs.dmadac[0] = devtag_get_device(machine, SOUND, "dac1"); - dcs.dmadac[1] = devtag_get_device(machine, SOUND, "dac2"); + dcs.dmadac[0] = devtag_get_device(machine, "dac1"); + dcs.dmadac[1] = devtag_get_device(machine, "dac2"); /* always boot from the base of "dcs" */ dcs.bootrom = (UINT16 *)memory_region(machine, "dcs"); @@ -1398,7 +1398,7 @@ static WRITE16_HANDLER( denver_w ) { char buffer[10]; sprintf(buffer, "dac%d", chan + 1); - dcs.dmadac[chan] = devtag_get_device(space->machine, SOUND, buffer); + dcs.dmadac[chan] = devtag_get_device(space->machine, buffer); } dmadac_enable(&dcs.dmadac[0], dcs.channels, enable); if (dcs.channels < 6) diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c index 3eb403cd678..4458dd61001 100644 --- a/src/mame/audio/depthch.c +++ b/src/mame/audio/depthch.c @@ -56,7 +56,7 @@ enum WRITE8_HANDLER( depthch_audio_w ) { static int port1State = 0; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; int bitsGoneHigh; int bitsGoneLow; diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index 18515c815db..92d986dcf98 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -978,7 +978,7 @@ static SOUND_START( dkong) dkong_state *state = machine->driver_data; state->snd_rom = memory_region(machine, "soundcpu"); - state->dev_vp2 = devtag_get_device(machine, LATCH8, "virtual_p2"); + state->dev_vp2 = devtag_get_device(machine, "virtual_p2"); } @@ -1152,11 +1152,11 @@ static ADDRESS_MAP_START( dkong_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dkong_sound_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0xFF) AM_DEVREAD(LATCH8, "ls175.3d", dkong_tune_r) + AM_RANGE(0x00, 0xFF) AM_DEVREAD("ls175.3d", dkong_tune_r) AM_WRITE(dkong_voice_w) - AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_DEVREAD(LATCH8, "ls175.3d", dkong_tune_r) + AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_DEVREAD("ls175.3d", dkong_tune_r) AM_WRITE(dkong_voice_w) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "discrete", dkong_p1_w) /* only write to dac */ + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("discrete", dkong_p1_w) /* only write to dac */ AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_LATCH8_READWRITE("virtual_p2") AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_LATCH8_READBIT("ls259.6h", 5) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4) @@ -1164,17 +1164,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dkongjr_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_LATCH8_READ("ls174.3d") - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "discrete", dkong_p1_w) /* only write to dac */ + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("discrete", dkong_p1_w) /* only write to dac */ AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_LATCH8_READWRITE("virtual_p2") AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_LATCH8_READBIT("ls259.6h", 5) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4) ADDRESS_MAP_END static ADDRESS_MAP_START( radarsc1_sound_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_DEVREAD(LATCH8, "ls175.3d", latch8_r) - AM_RANGE(0x00, 0xff) AM_DEVWRITE(SOUND, "discrete", dkong_p1_w) /* DAC here */ + AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_DEVREAD("ls175.3d", latch8_r) + AM_RANGE(0x00, 0xff) AM_DEVWRITE("discrete", dkong_p1_w) /* DAC here */ AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_LATCH8_READ("virtual_p1") - AM_DEVWRITE(SOUND, "tms", M58817_command_w) + AM_DEVWRITE("tms", M58817_command_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_LATCH8_WRITE("virtual_p2") AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_LATCH8_READBIT("ls259.6h", 5) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4) @@ -1184,16 +1184,16 @@ static ADDRESS_MAP_START( dkong3_sound1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x4016, 0x4016) AM_LATCH8_READ("latch1") /* overwrite default */ AM_RANGE(0x4017, 0x4017) AM_LATCH8_READ("latch2") - AM_RANGE(0x4000, 0x4017) AM_DEVREAD(SOUND, "nes1", nes_psg_r) - AM_RANGE(0x4000, 0x4017) AM_DEVWRITE(SOUND, "nes1", nes_psg_w) + AM_RANGE(0x4000, 0x4017) AM_DEVREAD("nes1", nes_psg_r) + AM_RANGE(0x4000, 0x4017) AM_DEVWRITE("nes1", nes_psg_w) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( dkong3_sound2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x4016, 0x4016) AM_LATCH8_READ("latch3") /* overwrite default */ - AM_RANGE(0x4000, 0x4017) AM_DEVREAD(SOUND, "nes2", nes_psg_r) - AM_RANGE(0x4000, 0x4017) AM_DEVWRITE(SOUND, "nes2", nes_psg_w) + AM_RANGE(0x4000, 0x4017) AM_DEVREAD("nes2", nes_psg_r) + AM_RANGE(0x4000, 0x4017) AM_DEVWRITE("nes2", nes_psg_w) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1239,7 +1239,7 @@ MACHINE_DRIVER_START( dkong2b_audio ) MDRV_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */ MDRV_LATCH8_INVERT( 0x20 ) /* signal is inverted */ - MDRV_LATCH8_DEVREAD(5, LATCH8, "ls259.6h", latch8_r, 3) + MDRV_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3) MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV) MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK) @@ -1272,8 +1272,8 @@ MACHINE_DRIVER_START( radarsc1_audio ) /* virtual_p2 is not read -see memory map-, all bits are output bits */ MDRV_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */ MDRV_LATCH8_INVERT( 0x80 ) /* signal is inverted */ - MDRV_LATCH8_DEVREAD(7, LATCH8, "ls259.6h", latch8_r, 3) - MDRV_LATCH8_DEVREAD(6, SOUND, "tms", tms5110_status_r, 0) + MDRV_LATCH8_DEVREAD(7, "ls259.6h", latch8_r, 3) + MDRV_LATCH8_DEVREAD(6, "tms", tms5110_status_r, 0) MDRV_SOUND_ADD("tms", M58817, XTAL_640kHz) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -1300,9 +1300,9 @@ MACHINE_DRIVER_START( dkongjr_audio ) MDRV_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */ MDRV_LATCH8_INVERT( 0x70 ) /* all signals are inverted */ - MDRV_LATCH8_DEVREAD(6, LATCH8, "ls259.4h", latch8_r, 1) - MDRV_LATCH8_DEVREAD(5, LATCH8, "ls259.6h", latch8_r, 3) - MDRV_LATCH8_DEVREAD(4, LATCH8, "ls259.6h", latch8_r, 6) + MDRV_LATCH8_DEVREAD(6, "ls259.4h", latch8_r, 1) + MDRV_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3) + MDRV_LATCH8_DEVREAD(4, "ls259.6h", latch8_r, 6) MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV) MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK) diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index d1a6e574afc..7246d6c7538 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -467,7 +467,7 @@ static void r6532_porta_w(const device_config *device, UINT8 newdata, UINT8 oldd static void r6532_portb_w(const device_config *device, UINT8 newdata, UINT8 olddata) { - const device_config *tms = devtag_get_device(device->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(device->machine, "tms"); if (device != NULL) { if ((olddata & 0x01) && !(newdata & 0x01)) @@ -489,7 +489,7 @@ static UINT8 r6532_portb_r(const device_config *device, UINT8 olddata) UINT8 newdata = olddata; if (has_tms5220) { - const device_config *tms = devtag_get_device(device->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(device->machine, "tms"); newdata &= ~0x0c; if (!tms5220_ready_r(tms)) newdata |= 0x04; if (!tms5220_int_r(tms)) newdata |= 0x08; @@ -720,13 +720,13 @@ static DEVICE_START( venture_common_sh_start ) DEVICE_START_CALL(common_sh_start); - riot = device_list_find_by_tag(machine->config->devicelist, RIOT6532, "riot"); + riot = devtag_get_device(machine, "riot"); has_sh8253 = TRUE; has_tms5220 = FALSE; /* determine which sound hardware is installed */ - has_mc3417 = (devtag_get_device(device->machine, SOUND, "cvsd") != NULL); + has_mc3417 = (devtag_get_device(device->machine, "cvsd") != NULL); /* 8253 */ freq_to_step = (double)(1 << 24) / (double)SH8253_CLOCK; @@ -782,7 +782,7 @@ static DEVICE_GET_INFO( venture_sound ) static ADDRESS_MAP_START( venture_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0780) AM_RAM - AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0780) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) + AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0780) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) AM_RANGE(0x1000, 0x1003) AM_MIRROR(0x07fc) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0x1800, 0x1803) AM_MIRROR(0x07fc) AM_READWRITE(exidy_sh8253_r, exidy_sh8253_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(exidy_sound_filter_w) @@ -816,7 +816,7 @@ MACHINE_DRIVER_END static WRITE8_HANDLER( mtrap_voiceio_w ) { if (!(offset & 0x10)) - hc55516_digit_w(devtag_get_device(space->machine, SOUND, "cvsd"), data & 1); + hc55516_digit_w(devtag_get_device(space->machine, "cvsd"), data & 1); if (!(offset & 0x20)) riot6532_portb_in_set(riot, data & 1, 0xff); @@ -835,7 +835,7 @@ static READ8_HANDLER( mtrap_voiceio_r ) } if (!(offset & 0x40)) - return hc55516_clock_state_r(devtag_get_device(space->machine, SOUND, "cvsd")) << 7; + return hc55516_clock_state_r(devtag_get_device(space->machine, "cvsd")) << 7; return 0; } @@ -992,7 +992,7 @@ static DEVICE_GET_INFO( victory_sound ) static ADDRESS_MAP_START( victory_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0f00) AM_RAM - AM_RANGE(0x1000, 0x107f) AM_MIRROR(0x0f80) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) + AM_RANGE(0x1000, 0x107f) AM_MIRROR(0x0f80) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x0ffc) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0x3000, 0x3003) AM_MIRROR(0x0ffc) AM_READWRITE(exidy_sh8253_r, exidy_sh8253_w) AM_RANGE(0x4000, 0x4fff) AM_NOP diff --git a/src/mame/audio/fghtbskt.c b/src/mame/audio/fghtbskt.c index d3ab1ef1229..9d2406da3e2 100644 --- a/src/mame/audio/fghtbskt.c +++ b/src/mame/audio/fghtbskt.c @@ -13,7 +13,7 @@ WRITE8_HANDLER( fghtbskt_samples_w ) { if( data & 1 ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); sample_start_raw(samples, 0, samplebuf + ((data & 0xf0) << 8), 0x2000, 8000, 0); } } diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c index a9b1cac2bd4..11b371b8d8e 100644 --- a/src/mame/audio/galaxian.c +++ b/src/mame/audio/galaxian.c @@ -154,7 +154,7 @@ static TIMER_CALLBACK( noise_timer_cb ) { if( !noise_enable && noisevolume > 0 ) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); noisevolume -= (noisevolume / 10) + 1; sample_set_volume(samples, CHANNEL_NOISE,noisevolume / 100.0); } @@ -166,7 +166,7 @@ WRITE8_HANDLER( galaxian_noise_enable_w ) if( noise_enable ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); noisevolume = 100; sample_set_volume(samples, CHANNEL_NOISE,noisevolume / 100.0); } @@ -176,7 +176,7 @@ WRITE8_HANDLER( galaxian_shoot_enable_w ) { if( data & 1 && !(last_port2 & 1) ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); sample_start_raw(samples, CHANNEL_SHOOT, shootwave, shoot_length, shoot_rate, 0); sample_set_volume(samples, CHANNEL_SHOOT,SHOOT_VOLUME); } @@ -417,7 +417,7 @@ static SAMPLES_START( galaxian_sh_start ) WRITE8_HANDLER( galaxian_background_enable_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); sample_set_volume(samples, CHANNEL_LFO+offset,(data & 1) ? LFO_VOLUME : 0); } @@ -542,7 +542,7 @@ WRITE8_HANDLER( galaxian_lfo_freq_w ) static TIMER_CALLBACK( galaxian_sh_update ) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* * NE555 8R, 8S and 8T are used as pulse position modulators diff --git a/src/mame/audio/gorf.c b/src/mame/audio/gorf.c index cec76bc9d61..33440fc81f1 100644 --- a/src/mame/audio/gorf.c +++ b/src/mame/audio/gorf.c @@ -116,7 +116,7 @@ static int plural = 0; READ8_HANDLER( gorf_speech_r ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int Phoneme,Intonation; int i = 0; @@ -182,6 +182,6 @@ READ8_HANDLER( gorf_speech_r ) CUSTOM_INPUT( gorf_speech_status_r ) { - const device_config *samples = devtag_get_device(field->port->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(field->port->machine, "samples"); return !sample_playing(samples, 0); } diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c index 9d3c289d804..eb64cb73de7 100644 --- a/src/mame/audio/gottlieb.c +++ b/src/mame/audio/gottlieb.c @@ -55,7 +55,7 @@ static void trigger_sample(const device_config *samples, UINT8 data); WRITE8_HANDLER( gottlieb_sh_w ) { - const device_config *riot = device_list_find_by_tag(space->machine->config->devicelist, RIOT6532, "riot"); + const device_config *riot = devtag_get_device(space->machine, "riot"); /* identify rev1 boards by the presence of a 6532 RIOT device */ if (riot != NULL) @@ -74,7 +74,7 @@ WRITE8_HANDLER( gottlieb_sh_w ) static void gottlieb1_sh_w(const device_config *riot, UINT8 data) { - const device_config *samples = devtag_get_device(riot->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(riot->machine, "samples"); int pa7 = (data & 0x0f) != 0xf; int pa0_5 = ~data & 0x3f; @@ -202,7 +202,7 @@ static void trigger_sample(const device_config *samples, UINT8 data) #ifdef UNUSED_FUNCTION void gottlieb_knocker(running_machine *machine) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); if (!strcmp(machine->gamedrv->name,"reactor")) /* reactor */ { } @@ -250,7 +250,7 @@ logerror("Votrax: intonation %d, phoneme %02x %s\n",data >> 6,data & 0x3f,Phonem { if (votrax_queuepos > 1) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int last = -1; int i; char phonemes[200]; @@ -317,8 +317,8 @@ static ADDRESS_MAP_START( gottlieb_sound1_map, ADDRESS_SPACE_PROGRAM, 8 ) /* A15 not decoded except in expansion socket */ ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0d80) AM_RAM - AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0de0) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) - AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0de0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0fff) AM_WRITE(vortrax_data_w) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0fff) AM_WRITE(speech_clock_dac_w) AM_RANGE(0x6000, 0x7fff) AM_ROM @@ -475,7 +475,7 @@ static WRITE8_HANDLER( nmi_rate_w ) static CUSTOM_INPUT( speech_drq_custom_r ) { - return sp0250_drq_r(devtag_get_device(field->port->machine, SOUND, "sp")); + return sp0250_drq_r(devtag_get_device(field->port->machine, "sp")); } @@ -503,7 +503,7 @@ static WRITE8_HANDLER( speech_control_w ) { /* bit 3 selects which of the two 8913 to enable */ /* bit 4 goes to the 8913 BC1 pin */ - const device_config *ay = devtag_get_device(space->machine, SOUND, (data & 0x08) ? "ay1" : "ay2"); + const device_config *ay = devtag_get_device(space->machine, (data & 0x08) ? "ay1" : "ay2"); ay8910_data_address_w(ay, data >> 4, *psg_latch); } @@ -512,14 +512,14 @@ static WRITE8_HANDLER( speech_control_w ) /* bit 6 = speech chip DATA PRESENT pin; high then low to make the chip read data */ if ((previous & 0x40) == 0 && (data & 0x40) != 0) { - const device_config *sp = devtag_get_device(space->machine, SOUND, "sp"); + const device_config *sp = devtag_get_device(space->machine, "sp"); sp0250_w(sp, 0, *sp0250_latch); } /* bit 7 goes to the speech chip RESET pin */ if ((previous ^ data) & 0x80) { - const device_config *sp = devtag_get_device(space->machine, SOUND, "sp"); + const device_config *sp = devtag_get_device(space->machine, "sp"); device_reset(sp); } } @@ -569,7 +569,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gottlieb_audio2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x3c00) AM_RAM - AM_RANGE(0x4000, 0x4001) AM_MIRROR(0x3ffe) AM_DEVWRITE(SOUND, "dac1", gottlieb_dac_w) AM_BASE(&dac_data) + AM_RANGE(0x4000, 0x4001) AM_MIRROR(0x3ffe) AM_DEVWRITE("dac1", gottlieb_dac_w) AM_BASE(&dac_data) AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x3fff) AM_READ(audio_data_r) AM_RANGE(0xe000, 0xffff) AM_MIRROR(0x2000) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/audio/gotya.c b/src/mame/audio/gotya.c index bbe376411e9..cc977e57b9e 100644 --- a/src/mame/audio/gotya.c +++ b/src/mame/audio/gotya.c @@ -41,7 +41,7 @@ static const struct gotya_sample gotya_samples[] = WRITE8_HANDLER( gotya_soundlatch_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); static int theme_playing; int sample_number; diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c index e33fd147e4f..a850cf01630 100644 --- a/src/mame/audio/gridlee.c +++ b/src/mame/audio/gridlee.c @@ -91,7 +91,7 @@ DEVICE_GET_INFO( gridlee_sound ) WRITE8_HANDLER( gridlee_sound_w ) { static UINT8 sound_data[24]; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); stream_update(gridlee_stream); diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c index 9a30f2baa1d..2436924d03a 100644 --- a/src/mame/audio/invinco.c +++ b/src/mame/audio/invinco.c @@ -66,7 +66,7 @@ enum WRITE8_HANDLER( invinco_audio_w ) { static int port2State = 0; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; int bitsGoneHigh; int bitsGoneLow; diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 80f802f0969..473fd036dcc 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -62,8 +62,8 @@ static WRITE8_HANDLER( m6803_port2_w ) /* write latch */ if ((port2 & 0x01) && !(data & 0x01)) { - const device_config *ay1 = devtag_get_device(space->machine, SOUND, "ay1"); - const device_config *ay2 = devtag_get_device(space->machine, SOUND, "ay2"); + const device_config *ay1 = devtag_get_device(space->machine, "ay1"); + const device_config *ay2 = devtag_get_device(space->machine, "ay2"); /* control or data port? */ if (port2 & 0x04) @@ -98,9 +98,9 @@ static READ8_HANDLER( m6803_port1_r ) { /* PSG 0 or 1? */ if (port2 & 0x08) - return ay8910_r(devtag_get_device(space->machine, SOUND, "ay1"), 0); + return ay8910_r(devtag_get_device(space->machine, "ay1"), 0); if (port2 & 0x10) - return ay8910_r(devtag_get_device(space->machine, SOUND, "ay2"), 0); + return ay8910_r(devtag_get_device(space->machine, "ay2"), 0); return 0xff; } @@ -120,8 +120,8 @@ static READ8_HANDLER( m6803_port2_r ) static WRITE8_DEVICE_HANDLER( ay8910_0_portb_w ) { - const device_config *adpcm0 = devtag_get_device(device->machine, SOUND, "msm1"); - const device_config *adpcm1 = devtag_get_device(device->machine, SOUND, "msm2"); + const device_config *adpcm0 = devtag_get_device(device->machine, "msm1"); + const device_config *adpcm1 = devtag_get_device(device->machine, "msm2"); /* bits 2-4 select MSM5205 clock & 3b/4b playback mode */ msm5205_playmode_w(adpcm0, (data >> 2) & 7); @@ -160,12 +160,12 @@ static WRITE8_HANDLER( m52_adpcm_w ) { if (offset & 1) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, "msm1"); + const device_config *adpcm = devtag_get_device(space->machine, "msm1"); msm5205_data_w(adpcm, data); } if (offset & 2) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, "msm2"); + const device_config *adpcm = devtag_get_device(space->machine, "msm2"); if (adpcm != NULL) msm5205_data_w(adpcm, data); } @@ -174,7 +174,7 @@ static WRITE8_HANDLER( m52_adpcm_w ) static WRITE8_HANDLER( m62_adpcm_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, (offset & 1) ? "msm2" : "msm1"); + const device_config *adpcm = devtag_get_device(space->machine, (offset & 1) ? "msm2" : "msm1"); if (adpcm != NULL) msm5205_data_w(adpcm, data); } @@ -189,7 +189,7 @@ static WRITE8_HANDLER( m62_adpcm_w ) static void adpcm_int(const device_config *device) { - const device_config *msm2 = devtag_get_device(device->machine, SOUND, "msm2"); + const device_config *msm2 = devtag_get_device(device->machine, "msm2"); cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c index 0017e8ccb20..ff5a83a69bf 100644 --- a/src/mame/audio/jaguar.c +++ b/src/mame/audio/jaguar.c @@ -439,12 +439,12 @@ WRITE32_HANDLER( jaguar_serial_w ) { /* right DAC */ case 2: - dac_signed_data_16_w(devtag_get_device(space->machine, SOUND, "dac2"), (data & 0xffff) ^ 0x8000); + dac_signed_data_16_w(devtag_get_device(space->machine, "dac2"), (data & 0xffff) ^ 0x8000); break; /* left DAC */ case 3: - dac_signed_data_16_w(devtag_get_device(space->machine, SOUND, "dac1"), (data & 0xffff) ^ 0x8000); + dac_signed_data_16_w(devtag_get_device(space->machine, "dac1"), (data & 0xffff) ^ 0x8000); break; /* frequency register */ diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index e87e7cdc266..d6478615cf8 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -147,7 +147,7 @@ static WRITE8_HANDLER( speech_strobe_w ) if ((new_speech_strobe_state != state->speech_strobe_state) && new_speech_strobe_state) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); tms5220_data_w(tms, 0, *state->speech_data); } state->speech_strobe_state = new_speech_strobe_state; @@ -156,7 +156,7 @@ static WRITE8_HANDLER( speech_strobe_w ) static READ8_HANDLER( speech_ready_r ) { - return (!tms5220_ready_r(devtag_get_device(space->machine, SOUND, "tms"))) << 7; + return (!tms5220_ready_r(devtag_get_device(space->machine, "tms"))) << 7; } @@ -175,10 +175,10 @@ static WRITE8_HANDLER( speech_reset_w ) static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x080f) AM_MIRROR(0x07c0) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x0810, 0x081f) AM_MIRROR(0x07c0) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) - AM_RANGE(0x0820, 0x082f) AM_MIRROR(0x07c0) AM_DEVREADWRITE(SOUND, "pokey3", pokey_r, pokey_w) - AM_RANGE(0x0830, 0x083f) AM_MIRROR(0x07c0) AM_DEVREADWRITE(SOUND, "pokey4", pokey_r, pokey_w) + AM_RANGE(0x0800, 0x080f) AM_MIRROR(0x07c0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x0810, 0x081f) AM_MIRROR(0x07c0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) + AM_RANGE(0x0820, 0x082f) AM_MIRROR(0x07c0) AM_DEVREADWRITE("pokey3", pokey_r, pokey_w) + AM_RANGE(0x0830, 0x083f) AM_MIRROR(0x07c0) AM_DEVREADWRITE("pokey4", pokey_r, pokey_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) diff --git a/src/mame/audio/laserbat.c b/src/mame/audio/laserbat.c index f6d7095c5a0..18892820302 100644 --- a/src/mame/audio/laserbat.c +++ b/src/mame/audio/laserbat.c @@ -13,7 +13,7 @@ WRITE8_HANDLER( laserbat_csound1_w ) WRITE8_HANDLER( laserbat_csound2_w ) { - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(space->machine, "sn"); int ksound = 0; if (data & 0x01) @@ -99,8 +99,8 @@ WRITE8_HANDLER( laserbat_csound2_w ) ksound = ((data & 0x02) << 23) + (ksound3 << 16) + (ksound2 << 8) + ksound1; - tms3615_enable_w(devtag_get_device(space->machine, SOUND, "tms1"), ksound & 0x1fff); - tms3615_enable_w(devtag_get_device(space->machine, SOUND, "tms2"), (ksound >> 13) << 1); + tms3615_enable_w(devtag_get_device(space->machine, "tms1"), ksound & 0x1fff); + tms3615_enable_w(devtag_get_device(space->machine, "tms2"), (ksound >> 13) << 1); bit14 = (data & 0x20) ? 1 : 0; diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c index fb021558f1f..6da37a9188f 100644 --- a/src/mame/audio/leland.c +++ b/src/mame/audio/leland.c @@ -518,7 +518,7 @@ static DEVICE_START( common_sh_start ) int i; /* determine which sound hardware is installed */ - has_ym2151 = (devtag_get_device(device->machine, SOUND, "ym") != NULL); + has_ym2151 = (devtag_get_device(device->machine, "ym") != NULL); /* allocate separate streams for the DMA and non-DMA DACs */ dma_stream = stream_create(device, 0, 1, OUTPUT_RATE, (void *)dmaspace, leland_80186_dma_update); @@ -2043,7 +2043,7 @@ static READ16_HANDLER( peripheral_r ) if (!has_ym2151) return pit8254_r(space, offset | 0x40, mem_mask); else - return ym2151_r(devtag_get_device(space->machine, SOUND, "ym"), offset); + return ym2151_r(devtag_get_device(space->machine, "ym"), offset); case 4: if (is_redline) @@ -2079,7 +2079,7 @@ static WRITE16_HANDLER( peripheral_w ) if (!has_ym2151) pit8254_w(space, offset | 0x40, data, mem_mask); else - ym2151_w(devtag_get_device(space->machine, SOUND, "ym"), offset, data); + ym2151_w(devtag_get_device(space->machine, "ym"), offset, data); break; case 4: diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 58e2cd1b406..d4f0c77ff7b 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -542,7 +542,7 @@ WRITE8_HANDLER( mario_sh3_w ) I8035_P1_W_AH(space,3,data & 1); break; case 7: /* skid */ - discrete_sound_w(devtag_get_device(space->machine, SOUND, "discrete"),DS_SOUND7_INP,data & 1); + discrete_sound_w(devtag_get_device(space->machine, "discrete"),DS_SOUND7_INP,data & 1); break; } } @@ -559,7 +559,7 @@ static ADDRESS_MAP_START( mario_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mario_sound_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0xff) AM_READ(mario_sh_tune_r) AM_DEVWRITE(SOUND, "discrete", mario_sh_sound_w) + AM_RANGE(0x00, 0xff) AM_READ(mario_sh_tune_r) AM_DEVWRITE("discrete", mario_sh_sound_w) AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(mario_sh_p1_r, mario_sh_p1_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(mario_sh_p2_r, mario_sh_p2_w) AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(mario_sh_t0_r) @@ -569,8 +569,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( masao_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END /************************************* diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index eefaff7b550..8fda82ce910 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -326,8 +326,8 @@ static TIMER_CALLBACK( ssio_delayed_data_w ) static void ssio_update_volumes(running_machine *machine) { - const device_config *ay0 = devtag_get_device(machine, SOUND, "ssio.1"); - const device_config *ay1 = devtag_get_device(machine, SOUND, "ssio.2"); + const device_config *ay0 = devtag_get_device(machine, "ssio.1"); + const device_config *ay1 = devtag_get_device(machine, "ssio.2"); ay8910_set_volume(ay0, 0, ssio_mute ? 0 : ssio_ayvolume_lookup[ssio_duty_cycle[0][0]]); ay8910_set_volume(ay0, 1, ssio_mute ? 0 : ssio_ayvolume_lookup[ssio_duty_cycle[0][1]]); ay8910_set_volume(ay0, 2, ssio_mute ? 0 : ssio_ayvolume_lookup[ssio_duty_cycle[0][2]]); @@ -458,12 +458,12 @@ static ADDRESS_MAP_START( ssio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x0c00) AM_RAM AM_RANGE(0x9000, 0x9003) AM_MIRROR(0x0ffc) AM_READ(ssio_data_r) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0ffc) AM_DEVWRITE(SOUND, "ssio.1", ay8910_address_w) - AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x0ffc) AM_DEVREAD(SOUND, "ssio.1", ay8910_r) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x0ffc) AM_DEVWRITE(SOUND, "ssio.1", ay8910_data_w) - AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x0ffc) AM_DEVWRITE(SOUND, "ssio.2", ay8910_address_w) - AM_RANGE(0xb001, 0xb001) AM_MIRROR(0x0ffc) AM_DEVREAD(SOUND, "ssio.2", ay8910_r) - AM_RANGE(0xb002, 0xb002) AM_MIRROR(0x0ffc) AM_DEVWRITE(SOUND, "ssio.2", ay8910_data_w) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0ffc) AM_DEVWRITE("ssio.1", ay8910_address_w) + AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x0ffc) AM_DEVREAD("ssio.1", ay8910_r) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x0ffc) AM_DEVWRITE("ssio.1", ay8910_data_w) + AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x0ffc) AM_DEVWRITE("ssio.2", ay8910_address_w) + AM_RANGE(0xb001, 0xb001) AM_MIRROR(0x0ffc) AM_DEVREAD("ssio.2", ay8910_r) + AM_RANGE(0xb002, 0xb002) AM_MIRROR(0x0ffc) AM_DEVWRITE("ssio.2", ay8910_data_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) @@ -501,7 +501,7 @@ MACHINE_DRIVER_END static WRITE8_DEVICE_HANDLER( csdeluxe_porta_w ) { dacval = (dacval & ~0x3fc) | (data << 2); - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, "csddac"), dacval << 6); + dac_signed_data_16_w(devtag_get_device(device->machine, "csddac"), dacval << 6); } static WRITE8_DEVICE_HANDLER( csdeluxe_portb_w ) @@ -509,7 +509,7 @@ static WRITE8_DEVICE_HANDLER( csdeluxe_portb_w ) UINT8 z_mask = pianew_get_port_b_z_mask(device); dacval = (dacval & ~0x003) | (data >> 6); - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, "csddac"), dacval << 6); + dac_signed_data_16_w(devtag_get_device(device->machine, "csddac"), dacval << 6); if (~z_mask & 0x10) csdeluxe_status = (csdeluxe_status & ~1) | ((data >> 4) & 1); if (~z_mask & 0x20) csdeluxe_status = (csdeluxe_status & ~2) | ((data >> 4) & 2); @@ -524,7 +524,7 @@ static WRITE_LINE_DEVICE_HANDLER( csdeluxe_irq ) static TIMER_CALLBACK( csdeluxe_delayed_data_w ) { - const device_config *pia = devtag_get_device(machine, PIA6821, "csdpia"); + const device_config *pia = devtag_get_device(machine, "csdpia"); pia_portb_w(pia, 0, param & 0x0f); pia_ca1_w(pia, 0, ~param & 0x10); @@ -579,7 +579,7 @@ static ADDRESS_MAP_START( csdeluxe_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x1ffff) AM_RANGE(0x000000, 0x007fff) AM_ROM - AM_RANGE(0x018000, 0x018007) AM_DEVREADWRITE(PIA6821, "csdpia", csdeluxe_pia_r, csdeluxe_pia_w) + AM_RANGE(0x018000, 0x018007) AM_DEVREADWRITE("csdpia", csdeluxe_pia_r, csdeluxe_pia_w) AM_RANGE(0x01c000, 0x01cfff) AM_RAM ADDRESS_MAP_END @@ -639,7 +639,7 @@ MACHINE_DRIVER_END static WRITE8_DEVICE_HANDLER( soundsgood_porta_w ) { dacval = (dacval & ~0x3fc) | (data << 2); - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, "sgdac"), dacval << 6); + dac_signed_data_16_w(devtag_get_device(device->machine, "sgdac"), dacval << 6); } static WRITE8_DEVICE_HANDLER( soundsgood_portb_w ) @@ -647,7 +647,7 @@ static WRITE8_DEVICE_HANDLER( soundsgood_portb_w ) UINT8 z_mask = pianew_get_port_b_z_mask(device); dacval = (dacval & ~0x003) | (data >> 6); - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, "sgdac"), dacval << 6); + dac_signed_data_16_w(devtag_get_device(device->machine, "sgdac"), dacval << 6); if (~z_mask & 0x10) soundsgood_status = (soundsgood_status & ~1) | ((data >> 4) & 1); if (~z_mask & 0x20) soundsgood_status = (soundsgood_status & ~2) | ((data >> 4) & 2); @@ -662,7 +662,7 @@ static WRITE_LINE_DEVICE_HANDLER( soundsgood_irq ) static TIMER_CALLBACK( soundsgood_delayed_data_w ) { - const device_config *pia = devtag_get_device(machine, PIA6821, "sgpia"); + const device_config *pia = devtag_get_device(machine, "sgpia"); pia_portb_w(pia, 0, (param >> 1) & 0x0f); pia_ca1_w(pia, 0, ~param & 0x01); @@ -698,7 +698,7 @@ static ADDRESS_MAP_START( soundsgood_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x7ffff) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x060000, 0x060007) AM_DEVREADWRITE8(PIA6821, "sgpia", pia_alt_r, pia_alt_w, 0xff00) + AM_RANGE(0x060000, 0x060007) AM_DEVREADWRITE8("sgpia", pia_alt_r, pia_alt_w, 0xff00) AM_RANGE(0x070000, 0x070fff) AM_RAM ADDRESS_MAP_END @@ -747,13 +747,13 @@ MACHINE_DRIVER_END static WRITE8_DEVICE_HANDLER( turbocs_porta_w ) { dacval = (dacval & ~0x3fc) | (data << 2); - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, "tcsdac"), dacval << 6); + dac_signed_data_16_w(devtag_get_device(device->machine, "tcsdac"), dacval << 6); } static WRITE8_DEVICE_HANDLER( turbocs_portb_w ) { dacval = (dacval & ~0x003) | (data >> 6); - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, "tcsdac"), dacval << 6); + dac_signed_data_16_w(devtag_get_device(device->machine, "tcsdac"), dacval << 6); turbocs_status = (data >> 4) & 3; } @@ -766,7 +766,7 @@ static WRITE_LINE_DEVICE_HANDLER( turbocs_irq ) static TIMER_CALLBACK( turbocs_delayed_data_w ) { - const device_config *pia = devtag_get_device(machine, PIA6821, "tcspia"); + const device_config *pia = devtag_get_device(machine, "tcspia"); pia_portb_w(pia, 0, (param >> 1) & 0x0f); pia_ca1_w(pia, 0, ~param & 0x01); @@ -800,7 +800,7 @@ void turbocs_reset_w(running_machine *machine, int state) static ADDRESS_MAP_START( turbocs_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x3800) AM_RAM - AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE(PIA6821, "tcspia", pia_alt_r, pia_alt_w) + AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE("tcspia", pia_alt_r, pia_alt_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -863,7 +863,7 @@ static WRITE8_DEVICE_HANDLER( squawkntalk_porta2_w ) static WRITE8_DEVICE_HANDLER( squawkntalk_portb2_w ) { - const device_config *tms = devtag_get_device(device->machine, SOUND, "sntspeech"); + const device_config *tms = devtag_get_device(device->machine, "sntspeech"); /* bits 0-1 select read/write strobes on the TMS5200 */ data &= 0x03; @@ -894,8 +894,8 @@ static WRITE8_DEVICE_HANDLER( squawkntalk_portb2_w ) static WRITE_LINE_DEVICE_HANDLER( squawkntalk_irq ) { - const device_config *pia0 = devtag_get_device(device->machine, PIA6821, "sntpia0"); - const device_config *pia1 = devtag_get_device(device->machine, PIA6821, "sntpia1"); + const device_config *pia0 = devtag_get_device(device->machine, "sntpia0"); + const device_config *pia1 = devtag_get_device(device->machine, "sntpia1"); int combined_state = pianew_get_irq_a(pia0) | pianew_get_irq_b(pia0) | pianew_get_irq_a(pia1) | pianew_get_irq_b(pia1); cpu_set_input_line(squawkntalk_sound_cpu, M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); @@ -903,7 +903,7 @@ static WRITE_LINE_DEVICE_HANDLER( squawkntalk_irq ) static TIMER_CALLBACK( squawkntalk_delayed_data_w ) { - const device_config *pia0 = devtag_get_device(machine, PIA6821, "sntpia0"); + const device_config *pia0 = devtag_get_device(machine, "sntpia0"); pia_porta_w(pia0, 0, ~param & 0x0f); pia_cb1_w(pia0, 0, ~param & 0x10); @@ -930,8 +930,8 @@ void squawkntalk_reset_w(running_machine *machine, int state) static ADDRESS_MAP_START( squawkntalk_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ - AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x4f6c) AM_DEVREADWRITE(PIA6821, "sntpia0", pia_r, pia_w) - AM_RANGE(0x0090, 0x0093) AM_MIRROR(0x4f6c) AM_DEVREADWRITE(PIA6821, "sntpia1", pia_r, pia_w) + AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x4f6c) AM_DEVREADWRITE("sntpia0", pia_r, pia_w) + AM_RANGE(0x0090, 0x0093) AM_MIRROR(0x4f6c) AM_DEVREADWRITE("sntpia1", pia_r, pia_w) AM_RANGE(0x1000, 0x1fff) AM_MIRROR(0x4000) AM_WRITE(squawkntalk_dac_w) AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM ADDRESS_MAP_END @@ -942,8 +942,8 @@ ADDRESS_MAP_END ADDRESS_MAP_START( squawkntalk_alt_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ - AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x676c) AM_DEVREADWRITE(PIA6821, "sntpia0", pia_r, pia_w) - AM_RANGE(0x0090, 0x0093) AM_MIRROR(0x676c) AM_DEVREADWRITE(PIA6821, "sntpia1", pia_r, pia_w) + AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x676c) AM_DEVREADWRITE("sntpia0", pia_r, pia_w) + AM_RANGE(0x0090, 0x0093) AM_MIRROR(0x676c) AM_DEVREADWRITE("sntpia1", pia_r, pia_w) AM_RANGE(0x0800, 0x0fff) AM_MIRROR(0x6000) AM_WRITE(squawkntalk_dac_w) AM_RANGE(0x8000, 0x9fff) AM_MIRROR(0x6000) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/audio/meadows.c b/src/mame/audio/meadows.c index 8dcb8eb8c87..e7a5e1740f5 100644 --- a/src/mame/audio/meadows.c +++ b/src/mame/audio/meadows.c @@ -60,7 +60,7 @@ SAMPLES_START( meadows_sh_start ) /************************************/ void meadows_sh_update(running_machine *machine) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); int preset, amp; if (latched_0c01 != meadows_0c01 || latched_0c03 != meadows_0c03) @@ -104,9 +104,9 @@ void meadows_sh_update(running_machine *machine) dac_enable = meadows_0c03 & ENABLE_DAC; if (dac_enable) - dac_data_w(devtag_get_device(machine, SOUND, "dac"), meadows_dac); + dac_data_w(devtag_get_device(machine, "dac"), meadows_dac); else - dac_data_w(devtag_get_device(machine, SOUND, "dac"), 0); + dac_data_w(devtag_get_device(machine, "dac"), 0); } latched_0c01 = meadows_0c01; @@ -121,9 +121,9 @@ void meadows_sh_dac_w(running_machine *machine, int data) { meadows_dac = data; if (dac_enable) - dac_data_w(devtag_get_device(machine, SOUND, "dac"), meadows_dac); + dac_data_w(devtag_get_device(machine, "dac"), meadows_dac); else - dac_data_w(devtag_get_device(machine, SOUND, "dac"), 0); + dac_data_w(devtag_get_device(machine, "dac"), 0); } diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index 5b7f1e01a8a..7d546257868 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -146,7 +146,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( seawolf_audio_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last; /* if (data & 0x01) enable SHIP HIT sound */ @@ -212,8 +212,8 @@ MACHINE_DRIVER_END WRITE8_HANDLER( gunfight_audio_w ) { - const device_config *samples0 = devtag_get_device(space->machine, SOUND, "samples1"); - const device_config *samples1 = devtag_get_device(space->machine, SOUND, "samples2"); + const device_config *samples0 = devtag_get_device(space->machine, "samples1"); + const device_config *samples1 = devtag_get_device(space->machine, "samples2"); /* D0 and D1 are just tied to 1k resistors */ @@ -1645,8 +1645,8 @@ WRITE8_HANDLER( gmissile_audio_1_w ) reversed (D5=R, D7=L), but the software confirms that ours is right */ - const device_config *samples0 = devtag_get_device(space->machine, SOUND, "samples1"); - const device_config *samples1 = devtag_get_device(space->machine, SOUND, "samples2"); + const device_config *samples0 = devtag_get_device(space->machine, "samples1"); + const device_config *samples1 = devtag_get_device(space->machine, "samples2"); UINT8 rising_bits = data & ~port_1_last; /* D0 and D1 are not connected */ @@ -1741,8 +1741,8 @@ MACHINE_DRIVER_END WRITE8_HANDLER( m4_audio_1_w ) { - const device_config *samples0 = devtag_get_device(space->machine, SOUND, "samples1"); - const device_config *samples1 = devtag_get_device(space->machine, SOUND, "samples2"); + const device_config *samples0 = devtag_get_device(space->machine, "samples1"); + const device_config *samples1 = devtag_get_device(space->machine, "samples2"); UINT8 rising_bits = data & ~port_1_last; /* D0 and D1 are not connected */ @@ -1769,8 +1769,8 @@ WRITE8_HANDLER( m4_audio_1_w ) WRITE8_HANDLER( m4_audio_2_w ) { - const device_config *samples0 = devtag_get_device(space->machine, SOUND, "samples1"); - const device_config *samples1 = devtag_get_device(space->machine, SOUND, "samples2"); + const device_config *samples0 = devtag_get_device(space->machine, "samples1"); + const device_config *samples1 = devtag_get_device(space->machine, "samples2"); UINT8 rising_bits = data & ~port_2_last; /* if (data & 0x01) enable LEFT PLAYER EXPLOSION sound via 510K res (goes to left speaker) */ @@ -2043,7 +2043,7 @@ WRITE8_HANDLER( clowns_audio_1_w ) WRITE8_DEVICE_HANDLER( clowns_audio_2_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 rising_bits = data & ~port_2_last; discrete_sound_w(device, CLOWNS_POP_BOTTOM_EN, (data >> 0) & 0x01); @@ -2745,7 +2745,7 @@ WRITE8_DEVICE_HANDLER( spcenctr_audio_2_w ) WRITE8_DEVICE_HANDLER( spcenctr_audio_3_w ) { - const device_config *sn = devtag_get_device(device->machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(device->machine, "sn"); /* if (data & 0x01) enable SCREECH (hit the sides) sound */ @@ -2798,7 +2798,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( phantom2_audio_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last; /* if (data & 0x01) enable PLAYER SHOT sound */ @@ -2820,7 +2820,7 @@ WRITE8_HANDLER( phantom2_audio_1_w ) WRITE8_HANDLER( phantom2_audio_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last; /* D0-D2 are not connected */ @@ -3660,7 +3660,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( invaders_audio_1_w ) { - const device_config *sn = devtag_get_device(device->machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(device->machine, "sn"); sn76477_enable_w(sn, (~data >> 0) & 0x01); /* saucer sound */ @@ -4042,7 +4042,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( invad2ct_audio_1_w ) { - const device_config *sn = devtag_get_device(device->machine, SOUND, "sn1"); + const device_config *sn = devtag_get_device(device->machine, "sn1"); sn76477_enable_w(sn, (~data >> 0) & 0x01); /* saucer sound */ @@ -4068,7 +4068,7 @@ WRITE8_DEVICE_HANDLER( invad2ct_audio_2_w ) WRITE8_DEVICE_HANDLER( invad2ct_audio_3_w ) { - const device_config *sn = devtag_get_device(device->machine, SOUND, "sn2"); + const device_config *sn = devtag_get_device(device->machine, "sn2"); sn76477_enable_w(sn, (~data >> 0) & 0x01); /* saucer sound */ diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c index 1e3a1ae5806..e8795d46e44 100644 --- a/src/mame/audio/n8080.c +++ b/src/mame/audio/n8080.c @@ -170,13 +170,13 @@ static void stop_mono_flop(const device_config *sn, int n) static TIMER_CALLBACK( stop_mono_flop_callback ) { - stop_mono_flop(devtag_get_device(machine, SOUND, "sn"), param); + stop_mono_flop(devtag_get_device(machine, "sn"), param); } static void spacefev_sound_pins_changed(running_machine *machine) { - const device_config *sn = devtag_get_device(machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(machine, "sn"); UINT16 changes = ~curr_sound_pins & prev_sound_pins; if (changes & (1 << 0x3)) @@ -208,7 +208,7 @@ static void spacefev_sound_pins_changed(running_machine *machine) static void sheriff_sound_pins_changed(running_machine *machine) { - const device_config *sn = devtag_get_device(machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(machine, "sn"); UINT16 changes = ~curr_sound_pins & prev_sound_pins; if (changes & (1 << 0x6)) @@ -410,13 +410,13 @@ static READ8_HANDLER( helifire_8035_p2_r ) static WRITE8_HANDLER( n8080_dac_w ) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), data & 0x80); + dac_data_w(devtag_get_device(space->machine, "dac"), data & 0x80); } static WRITE8_HANDLER( helifire_dac_w ) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), data * helifire_dac_volume); + dac_data_w(devtag_get_device(space->machine, "dac"), data * helifire_dac_volume); } @@ -442,7 +442,7 @@ static WRITE8_HANDLER( helifire_sound_ctrl_w ) static TIMER_CALLBACK( spacefev_vco_voltage_timer ) { - const device_config *sn = devtag_get_device(machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(machine, "sn"); double voltage = 0; if (mono_flop[2]) diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c index 2938e751083..cc9fc11c1a7 100644 --- a/src/mame/audio/namco54.c +++ b/src/mame/audio/namco54.c @@ -99,9 +99,9 @@ ADDRESS_MAP_END ADDRESS_MAP_START( namco_54xx_map_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_54xx_K_r) - AM_RANGE(MB88_PORTO, MB88_PORTO) AM_DEVWRITE(SOUND, "discrete", namco_54xx_O_w) + AM_RANGE(MB88_PORTO, MB88_PORTO) AM_DEVWRITE("discrete", namco_54xx_O_w) AM_RANGE(MB88_PORTR0, MB88_PORTR0) AM_READ(namco_54xx_R0_r) - AM_RANGE(MB88_PORTR1, MB88_PORTR1) AM_DEVWRITE(SOUND, "discrete", namco_54xx_R1_w) + AM_RANGE(MB88_PORTR1, MB88_PORTR1) AM_DEVWRITE("discrete", namco_54xx_R1_w) AM_RANGE(MB88_PORTR2, MB88_PORTR2) AM_NOP ADDRESS_MAP_END diff --git a/src/mame/audio/namcoc7x.c b/src/mame/audio/namcoc7x.c index 7b1073bbb1b..9342544cea4 100644 --- a/src/mame/audio/namcoc7x.c +++ b/src/mame/audio/namcoc7x.c @@ -126,7 +126,7 @@ static WRITE16_HANDLER( c7x_shared_w ) } ADDRESS_MAP_START( namcoc7x_mcu_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE(SOUND, "c352", c352_r, c352_w) + AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w) AM_RANGE(0x004000, 0x00bfff) AM_RAM AM_BASE(&namcoc7x_mcuram) AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c7x", 0x8c000) AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("c7x", 0) @@ -137,7 +137,7 @@ ADDRESS_MAP_START( namcoc7x_mcu_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END ADDRESS_MAP_START( namcoc7x_mcu_share_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE(SOUND, "c352", c352_r, c352_w ) + AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w ) AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( c7x_shared_r, c7x_shared_w ) AM_BASE(&namcoc7x_mcuram) AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c7x", 0x8c000) AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("c7x", 0) diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c index 44adda93ced..b414e7c0adb 100644 --- a/src/mame/audio/phoenix.c +++ b/src/mame/audio/phoenix.c @@ -515,7 +515,7 @@ WRITE8_DEVICE_HANDLER( phoenix_sound_control_b_w ) discrete_sound_w(device, PHOENIX_EFFECT_1_FREQ, data & 0x10); /* update the tune that the MM6221AA is playing */ - mm6221aa_tune_w(devtag_get_device(device->machine, SOUND, "tms"), data >> 6); + mm6221aa_tune_w(devtag_get_device(device->machine, "tms"), data >> 6); } static DEVICE_START( phoenix_sound ) diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c index 60dc3991bf5..be00549795a 100644 --- a/src/mame/audio/pleiads.c +++ b/src/mame/audio/pleiads.c @@ -436,7 +436,7 @@ WRITE8_HANDLER( pleiads_sound_control_b_w ) if (pitch == 3) pitch = 2; /* 2 and 3 are the same */ - tms36xx_note_w(devtag_get_device(space->machine, SOUND, "tms"), pitch, note); + tms36xx_note_w(devtag_get_device(space->machine, "tms"), pitch, note); stream_update(channel); sound_latch_b = data; diff --git a/src/mame/audio/polyplay.c b/src/mame/audio/polyplay.c index 3ba5f4e0f3c..6ec04b3868f 100644 --- a/src/mame/audio/polyplay.c +++ b/src/mame/audio/polyplay.c @@ -49,7 +49,7 @@ void polyplay_set_channel2(int active) void polyplay_play_channel1(running_machine *machine, int data) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); if (data) { freq1 = 2457600 / 16 / data / 8; sample_set_volume(samples, 0, channel_playing1 * 1.0); @@ -63,7 +63,7 @@ void polyplay_play_channel1(running_machine *machine, int data) void polyplay_play_channel2(running_machine *machine, int data) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); if (data) { freq2 = 2457600 / 16 / data / 8; sample_set_volume(samples, 1, channel_playing2 * 1.0); diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c index f5646e48e1e..825e415a031 100644 --- a/src/mame/audio/pulsar.c +++ b/src/mame/audio/pulsar.c @@ -88,7 +88,7 @@ static int port1State = 0; WRITE8_HANDLER( pulsar_audio_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; int bitsGoneHigh; int bitsGoneLow; @@ -139,7 +139,7 @@ WRITE8_HANDLER( pulsar_audio_1_w ) WRITE8_HANDLER( pulsar_audio_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); static int port2State = 0; int bitsChanged; int bitsGoneHigh; diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c index 96cd15f8a3c..27029f976ba 100644 --- a/src/mame/audio/qix.c +++ b/src/mame/audio/qix.c @@ -154,8 +154,8 @@ static WRITE_LINE_DEVICE_HANDLER( qix_pia_sint ) static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM - AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x5ffc) AM_DEVREADWRITE(PIA6821, "sndpia2", pia_r, pia_w) - AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE(PIA6821, "sndpia1", pia_r, pia_w) + AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x5ffc) AM_DEVREADWRITE("sndpia2", pia_r, pia_w) + AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE("sndpia1", pia_r, pia_w) AM_RANGE(0xd000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -175,9 +175,9 @@ static const pia6821_interface qixsnd_pia_0_intf = DEVCB_NULL, /* line CB1 in */ DEVCB_NULL, /* line CA2 in */ DEVCB_NULL, /* line CB2 in */ - DEVCB_DEVICE_HANDLER(PIA6821, "sndpia1", sync_sndpia1_porta_w), /* port A out */ - DEVCB_DEVICE_HANDLER(SOUND, "discrete", qix_vol_w), /* port B out */ - DEVCB_DEVICE_HANDLER(PIA6821, "sndpia1", pia_ca1_w), /* line CA2 out */ + DEVCB_DEVICE_HANDLER("sndpia1", sync_sndpia1_porta_w), /* port A out */ + DEVCB_DEVICE_HANDLER("discrete", qix_vol_w), /* port B out */ + DEVCB_DEVICE_HANDLER("sndpia1", pia_ca1_w), /* line CA2 out */ DEVCB_HANDLER(qix_flip_screen_w), /* port CB2 out */ DEVCB_LINE(qix_pia_dint), /* IRQA */ DEVCB_LINE(qix_pia_dint) /* IRQB */ @@ -191,9 +191,9 @@ static const pia6821_interface qixsnd_pia_1_intf = DEVCB_NULL, /* line CB1 in */ DEVCB_NULL, /* line CA2 in */ DEVCB_NULL, /* line CB2 in */ - DEVCB_DEVICE_HANDLER(PIA6821, "sndpia0", pia_porta_w), /* port A out */ - DEVCB_DEVICE_HANDLER(SOUND, "discrete", qix_dac_w), /* port B out */ - DEVCB_DEVICE_HANDLER(PIA6821, "sndpia0", pia_ca1_w), /* line CA2 out */ + DEVCB_DEVICE_HANDLER("sndpia0", pia_porta_w), /* port A out */ + DEVCB_DEVICE_HANDLER("discrete", qix_dac_w), /* port B out */ + DEVCB_DEVICE_HANDLER("sndpia0", pia_ca1_w), /* line CA2 out */ DEVCB_NULL, /* line CB2 out */ DEVCB_LINE(qix_pia_sint), /* IRQA */ DEVCB_LINE(qix_pia_sint) /* IRQB */ diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c index 60d2d01dbc3..4a965b16a30 100644 --- a/src/mame/audio/redalert.c +++ b/src/mame/audio/redalert.c @@ -138,7 +138,7 @@ static const ay8910_interface 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_READNOP AM_DEVWRITE(SOUND, "ay", redalert_AY8910_w) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0ffe) AM_READNOP AM_DEVWRITE("ay", 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 @@ -172,13 +172,13 @@ WRITE8_HANDLER( redalert_voice_command_w ) static void sod_callback(const device_config *device, int data) { - hc55516_digit_w(devtag_get_device(device->machine, SOUND, "cvsd"), data); + hc55516_digit_w(devtag_get_device(device->machine, "cvsd"), data); } static int sid_callback(const device_config *device) { - return hc55516_clock_state_r(devtag_get_device(device->machine, SOUND, "cvsd")); + return hc55516_clock_state_r(devtag_get_device(device->machine, "cvsd")); } @@ -311,8 +311,8 @@ static READ8_HANDLER( demoneye_ay8910_latch_2_r ) static WRITE8_HANDLER( demoneye_ay8910_data_w ) { - const device_config *ay1 = devtag_get_device(space->machine, SOUND, "ay1"); - const device_config *ay2 = devtag_get_device(space->machine, SOUND, "ay2"); + const device_config *ay1 = devtag_get_device(space->machine, "ay1"); + const device_config *ay2 = devtag_get_device(space->machine, "ay2"); switch (ay8910_latch_1 & 0x03) { diff --git a/src/mame/audio/rockola.c b/src/mame/audio/rockola.c index 28c57383451..175fe1b8f77 100644 --- a/src/mame/audio/rockola.c +++ b/src/mame/audio/rockola.c @@ -652,7 +652,7 @@ int rockola_music0_playing(void) WRITE8_HANDLER( sasuke_sound_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); switch (offset) { case 0: @@ -718,7 +718,7 @@ WRITE8_HANDLER( sasuke_sound_w ) WRITE8_HANDLER( satansat_sound_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); switch (offset) { case 0: @@ -781,7 +781,7 @@ WRITE8_HANDLER( satansat_sound_w ) WRITE8_HANDLER( vanguard_sound_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); switch (offset) { case 0: @@ -827,7 +827,7 @@ WRITE8_HANDLER( vanguard_sound_w ) } /* SHOT B */ - sn76477_enable_w(devtag_get_device(space->machine, SOUND, "sn76477.2"), (data & 0x40) ? 0 : 1); + sn76477_enable_w(devtag_get_device(space->machine, "sn76477.2"), (data & 0x40) ? 0 : 1); LastPort1 = data; break; @@ -917,7 +917,7 @@ WRITE8_HANDLER( fantasy_sound_w ) } /* BOMB */ - discrete_sound_w(devtag_get_device(space->machine, SOUND, "discrete"), FANTASY_BOMB_EN, data & 0x80); + discrete_sound_w(devtag_get_device(space->machine, "discrete"), FANTASY_BOMB_EN, data & 0x80); LastPort1 = data; break; @@ -1034,7 +1034,7 @@ static void rockola_speech_w(running_machine *machine, UINT8 data, const UINT16 if ((data & HD38880_CTP) && (data & HD38880_CMV)) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); data &= HD68880_SYBS; switch (hd38880_cmd) @@ -1053,7 +1053,7 @@ static void rockola_speech_w(running_machine *machine, UINT8 data, const UINT16 { if (table[i] && table[i] == hd38880_addr) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); sample_start(samples, 0, start + i, 0); break; } diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c index 7bbf97336e2..cc9975e19e6 100644 --- a/src/mame/audio/scramble.c +++ b/src/mame/audio/scramble.c @@ -181,19 +181,19 @@ static void filter_w(const device_config *device, int data) WRITE8_HANDLER( scramble_filter_w ) { - filter_w(devtag_get_device(space->machine, SOUND, "filter.1.0"), (offset >> 0) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.1.1"), (offset >> 2) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.1.2"), (offset >> 4) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.0"), (offset >> 6) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.1"), (offset >> 8) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.2"), (offset >> 10) & 3); + filter_w(devtag_get_device(space->machine, "filter.1.0"), (offset >> 0) & 3); + filter_w(devtag_get_device(space->machine, "filter.1.1"), (offset >> 2) & 3); + filter_w(devtag_get_device(space->machine, "filter.1.2"), (offset >> 4) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.0"), (offset >> 6) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.1"), (offset >> 8) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.2"), (offset >> 10) & 3); } WRITE8_HANDLER( frogger_filter_w ) { - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.0"), (offset >> 6) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.1"), (offset >> 8) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.2"), (offset >> 10) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.0"), (offset >> 6) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.1"), (offset >> 8) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.2"), (offset >> 10) & 3); } @@ -300,7 +300,7 @@ static UINT8 speech_cnt; static TIMER_CALLBACK( ad2083_step ) { - const device_config *tms = devtag_get_device(machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(machine, "tms"); /* only 16 bytes needed ... The original dump is bad. This * is what is needed to get speech to work. The prom data has @@ -407,10 +407,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ad2083_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x01, 0x01) AM_WRITE(ad2083_tms5110_ctrl_w) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x20, 0x20) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay2", ay8910_address_w) ADDRESS_MAP_END static SOUND_START( ad2083 ) diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c index 78187e16a08..66845f90459 100644 --- a/src/mame/audio/segag80r.c +++ b/src/mame/audio/segag80r.c @@ -244,7 +244,7 @@ WRITE8_HANDLER( astrob_sound_w ) { 120.0f, 82.0f, 62.0f, 56.0f, 47.0f, 39.0f, 33.0f, 27.0f, 24.0f, 22.0f }; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); float freq_factor; UINT8 diff = data ^ sound_state[offset]; @@ -476,7 +476,7 @@ static SOUND_START( 005 ) static WRITE8_DEVICE_HANDLER( sega005_sound_a_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[0]; sound_state[0] = data; @@ -704,7 +704,7 @@ static SOUND_START( spaceod ) WRITE8_HANDLER( spaceod_sound_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 diff = data ^ sound_state[offset]; sound_state[offset] = data; @@ -814,9 +814,9 @@ static ADDRESS_MAP_START( monsterb_7751_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(n7751_t1_r) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(n7751_command_r) AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(n7751_rom_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) - AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE(I8243, "audio_8243", n7751_p2_w) - AM_RANGE(MCS48_PORT_PROG, MCS48_PORT_PROG) AM_DEVWRITE(I8243, "audio_8243", i8243_prog_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE("audio_8243", n7751_p2_w) + AM_RANGE(MCS48_PORT_PROG, MCS48_PORT_PROG) AM_DEVWRITE("audio_8243", i8243_prog_w) ADDRESS_MAP_END @@ -889,7 +889,7 @@ static SOUND_START( monsterb ) static WRITE8_DEVICE_HANDLER( monsterb_sound_a_w ) { - const device_config *tms = devtag_get_device(device->machine, SOUND, "music"); + const device_config *tms = devtag_get_device(device->machine, "music"); int enable_val; /* Lower four data lines get decoded into 13 control lines */ @@ -910,7 +910,7 @@ static WRITE8_DEVICE_HANDLER( monsterb_sound_a_w ) static WRITE8_DEVICE_HANDLER( monsterb_sound_b_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[1]; sound_state[1] = data; diff --git a/src/mame/audio/segag80v.c b/src/mame/audio/segag80v.c index 8c3ab810a68..735228fb7c2 100644 --- a/src/mame/audio/segag80v.c +++ b/src/mame/audio/segag80v.c @@ -137,7 +137,7 @@ d0 crafts joining WRITE8_HANDLER( elim1_sh_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); data ^= 0xff; /* Play fireball sample */ @@ -171,7 +171,7 @@ WRITE8_HANDLER( elim1_sh_w ) WRITE8_HANDLER( elim2_sh_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); data ^= 0xff; /* Play thrust sample */ @@ -198,7 +198,7 @@ WRITE8_HANDLER( elim2_sh_w ) WRITE8_HANDLER( zektor1_sh_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); data ^= 0xff; @@ -233,7 +233,7 @@ WRITE8_HANDLER( zektor1_sh_w ) WRITE8_HANDLER( zektor2_sh_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); data ^= 0xff; /* Play thrust sample */ @@ -261,7 +261,7 @@ WRITE8_HANDLER( zektor2_sh_w ) WRITE8_HANDLER( spacfury1_sh_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); data ^= 0xff; /* craft growing */ @@ -298,7 +298,7 @@ WRITE8_HANDLER( spacfury1_sh_w ) WRITE8_HANDLER( spacfury2_sh_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); data ^= 0xff; /* craft joining */ diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c index 095d47c59b2..f55b3a8aa7b 100644 --- a/src/mame/audio/segasnd.c +++ b/src/mame/audio/segasnd.c @@ -248,7 +248,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( speech_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0xff) AM_READ(speech_rom_r) - AM_RANGE(0x00, 0xff) AM_DEVWRITE(SOUND, "speech", sp0250_w) + AM_RANGE(0x00, 0xff) AM_DEVWRITE("speech", sp0250_w) AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(speech_p1_r, speech_p1_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(speech_p2_w) AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(speech_t0_r) diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index 70828efa8e1..9a294590037 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -472,13 +472,13 @@ ADDRESS_MAP_START( seibu_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) 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_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) - AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) ADDRESS_MAP_END @@ -491,13 +491,13 @@ ADDRESS_MAP_START( seibu2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) 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_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) - AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) ADDRESS_MAP_END @@ -509,14 +509,14 @@ ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) 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_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) - AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x6002, 0x6002) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x6002, 0x6002) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) ADDRESS_MAP_END @@ -529,13 +529,13 @@ ADDRESS_MAP_START( seibu3_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) 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_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) - AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) ADDRESS_MAP_END @@ -546,17 +546,17 @@ ADDRESS_MAP_START( seibu3_adpcm_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x4005, 0x4006) AM_DEVWRITE(SOUND, "adpcm1", seibu_adpcm_adr_w) + AM_RANGE(0x4005, 0x4006) AM_DEVWRITE("adpcm1", seibu_adpcm_adr_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) 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_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) - AM_RANGE(0x401a, 0x401a) AM_DEVWRITE(SOUND, "adpcm1", seibu_adpcm_ctl_w) + AM_RANGE(0x401a, 0x401a) AM_DEVWRITE("adpcm1", seibu_adpcm_ctl_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) - AM_RANGE(0x6005, 0x6006) AM_DEVWRITE(SOUND, "adpcm2", seibu_adpcm_adr_w) - AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) - AM_RANGE(0x601a, 0x601a) AM_DEVWRITE(SOUND, "adpcm2", seibu_adpcm_ctl_w) + AM_RANGE(0x6005, 0x6006) AM_DEVWRITE("adpcm2", seibu_adpcm_adr_w) + AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) + AM_RANGE(0x601a, 0x601a) AM_DEVWRITE("adpcm2", seibu_adpcm_ctl_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) ADDRESS_MAP_END diff --git a/src/mame/audio/senjyo.c b/src/mame/audio/senjyo.c index 01491938e4e..0c31d9280b4 100644 --- a/src/mame/audio/senjyo.c +++ b/src/mame/audio/senjyo.c @@ -14,8 +14,8 @@ static int single_volume = 0; const z80_daisy_chain senjyo_daisy_chain[] = { - { Z80CTC, "z80ctc" }, - { Z80PIO, "z80pio" }, + { "z80ctc" }, + { "z80pio" }, { NULL } }; @@ -50,7 +50,7 @@ const z80ctc_interface senjyo_ctc_intf = WRITE8_HANDLER( senjyo_volume_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); single_volume = data & 0x0f; sample_set_volume(samples,0,single_volume / 15.0); } @@ -58,10 +58,10 @@ WRITE8_HANDLER( senjyo_volume_w ) static TIMER_CALLBACK( senjyo_sh_update ) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); /* ctc2 timer single tone generator frequency */ - attotime period = z80ctc_getperiod (devtag_get_device(machine, Z80CTC, "z80ctc"), 2); + attotime period = z80ctc_getperiod (devtag_get_device(machine, "z80ctc"), 2); if (attotime_compare(period, attotime_zero) != 0 ) single_rate = ATTOSECONDS_TO_HZ(period.attoseconds); else diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c index 1516de54ce1..5535eaa961f 100644 --- a/src/mame/audio/spacefb.c +++ b/src/mame/audio/spacefb.c @@ -36,7 +36,7 @@ READ8_HANDLER( spacefb_audio_t1_r ) WRITE8_HANDLER( spacefb_port_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); cpu_set_input_line(space->machine->cpu[1], 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c index 0938ea1ef6b..c7dbd2db47c 100644 --- a/src/mame/audio/starwars.c +++ b/src/mame/audio/starwars.c @@ -21,7 +21,7 @@ static const device_config *riot; SOUND_START( starwars ) { - riot = device_list_find_by_tag(machine->config->devicelist, RIOT6532, "riot"); + riot = devtag_get_device(machine, "riot"); } @@ -45,13 +45,13 @@ static UINT8 r6532_porta_r(const device_config *device, UINT8 olddata) /* d0 (out) TMS5220 Not Write */ /* Note: bit 4 is always set to avoid sound self test */ - return (olddata & 0xc0) | 0x10 | (!tms5220_ready_r(devtag_get_device(device->machine, SOUND, "tms")) << 2); + return (olddata & 0xc0) | 0x10 | (!tms5220_ready_r(devtag_get_device(device->machine, "tms")) << 2); } static void r6532_porta_w(const device_config *device, UINT8 newdata, UINT8 olddata) { - const device_config *tms = devtag_get_device(device->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(device->machine, "tms"); /* handle 5220 read */ if ((olddata & 2) != 0 && (newdata & 2) == 0) diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c index 440600daab6..c38643865f7 100644 --- a/src/mame/audio/t5182.c +++ b/src/mame/audio/t5182.c @@ -307,7 +307,7 @@ ADDRESS_MAP_END // 50 W test mode status flags (bit 0 = ROM test fail, bit 1 = RAM test fail, bit 2 = YM2151 IRQ not received) ADDRESS_MAP_START( t5182_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x10, 0x10) AM_WRITE(t5182_sharedram_semaphore_snd_acquire_w) AM_RANGE(0x11, 0x11) AM_WRITE(t5182_sharedram_semaphore_snd_release_w) AM_RANGE(0x12, 0x12) AM_WRITE(t5182_ym2151_irq_ack_w) diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c index 2ff8c106a45..ff9e7674189 100644 --- a/src/mame/audio/taito_en.c +++ b/src/mame/audio/taito_en.c @@ -47,7 +47,7 @@ WRITE16_HANDLER( f3_es5505_bank_w ) /* mask out unused bits */ data &= max_banks_this_game; - es5505_voice_bank_w(devtag_get_device(space->machine, SOUND, "ensoniq"),offset,data<<20); + es5505_voice_bank_w(devtag_get_device(space->machine, "ensoniq"),offset,data<<20); } WRITE16_HANDLER( f3_volume_w ) @@ -233,7 +233,7 @@ static UINT16 *sound_ram; ADDRESS_MAP_START( f3_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_MIRROR(0x30000) AM_SHARE(1) AM_BASE(&sound_ram) AM_RANGE(0x140000, 0x140fff) AM_READWRITE(f3_68000_share_r, f3_68000_share_w) - AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE(SOUND, "ensoniq", es5505_r, es5505_w) + AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("ensoniq", es5505_r, es5505_w) AM_RANGE(0x260000, 0x2601ff) AM_READWRITE(es5510_dsp_r, es5510_dsp_w) AM_RANGE(0x280000, 0x28001f) AM_READWRITE(f3_68681_r, f3_68681_w) AM_RANGE(0x300000, 0x30003f) AM_WRITE(f3_es5505_bank_w) diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c index 3aeb9fc8d34..b543a5f3128 100644 --- a/src/mame/audio/targ.c +++ b/src/mame/audio/targ.c @@ -61,11 +61,11 @@ static void adjust_sample(const device_config *samples, UINT8 freq) WRITE8_HANDLER( targ_audio_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); /* CPU music */ if ((data & 0x01) != (port_1_last & 0x01)) - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"),(data & 0x01) * 0xff); + dac_data_w(devtag_get_device(space->machine, "dac"),(data & 0x01) * 0xff); /* shot */ if (FALLING_EDGE(0x02) && !sample_playing(samples, 0)) sample_start(samples, 0,1,0); @@ -114,7 +114,7 @@ WRITE8_HANDLER( targ_audio_2_w ) { if ((data & 0x01) && !(port_2_last & 0x01)) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 *prom = memory_region(space->machine, "targ"); tone_pointer = (tone_pointer + 1) & 0x0f; @@ -128,7 +128,7 @@ WRITE8_HANDLER( targ_audio_2_w ) WRITE8_HANDLER( spectar_audio_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); adjust_sample(samples, data); } @@ -147,7 +147,7 @@ static const char *const sample_names[] = static void common_audio_start(running_machine *machine, int freq) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); max_freq = freq; tone_freq = 0; diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index bf61872a466..d8aca15e752 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -89,12 +89,12 @@ static void filter_w(const device_config *device, int data) static WRITE8_HANDLER( timeplt_filter_w ) { - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.0"), (offset >> 6) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.1"), (offset >> 8) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.0.2"), (offset >> 10) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.1.0"), (offset >> 0) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.1.1"), (offset >> 2) & 3); - filter_w(devtag_get_device(space->machine, SOUND, "filter.1.2"), (offset >> 4) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.0"), (offset >> 6) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.1"), (offset >> 8) & 3); + filter_w(devtag_get_device(space->machine, "filter.0.2"), (offset >> 10) & 3); + filter_w(devtag_get_device(space->machine, "filter.1.0"), (offset >> 0) & 3); + filter_w(devtag_get_device(space->machine, "filter.1.1"), (offset >> 2) & 3); + filter_w(devtag_get_device(space->machine, "filter.1.2"), (offset >> 4) & 3); } @@ -127,10 +127,10 @@ WRITE8_HANDLER( timeplt_sh_irqtrigger_w ) static ADDRESS_MAP_START( timeplt_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0x8000, 0xffff) AM_WRITE(timeplt_filter_w) ADDRESS_MAP_END @@ -139,10 +139,10 @@ static ADDRESS_MAP_START( locomotn_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_RANGE(0x3000, 0x3fff) AM_WRITE(timeplt_filter_w) - AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_address_w) ADDRESS_MAP_END diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c index bfc41a61542..15bba1b9d44 100644 --- a/src/mame/audio/trackfld.c +++ b/src/mame/audio/trackfld.c @@ -57,7 +57,7 @@ READ8_HANDLER( hyperspt_sh_timer_r ) { UINT32 clock = cpu_get_total_cycles(space->cpu) / TIMER_RATE; - return (clock & 0x3) | (vlm5030_bsy(devtag_get_device(space->machine, SOUND, "vlm"))? 0x04 : 0); + return (clock & 0x3) | (vlm5030_bsy(devtag_get_device(space->machine, "vlm"))? 0x04 : 0); } WRITE8_DEVICE_HANDLER( hyperspt_sound_w ) diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c index 73ec844c8f3..58c2dbf461e 100644 --- a/src/mame/audio/turbo.c +++ b/src/mame/audio/turbo.c @@ -40,7 +40,7 @@ static int last_sound_a; static TIMER_CALLBACK( update_sound_a ) { - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); int data = param; /* missing short crash sample, but I've never seen it triggered */ @@ -72,7 +72,7 @@ if (!((data >> 4) & 1)) mame_printf_debug("/TRIG4\n"); WRITE8_DEVICE_HANDLER( turbo_sound_a_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; UINT8 diff = data ^ state->sound_state[0]; state->sound_state[0] = data; @@ -121,7 +121,7 @@ WRITE8_DEVICE_HANDLER( turbo_sound_a_w ) WRITE8_DEVICE_HANDLER( turbo_sound_b_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; @@ -144,7 +144,7 @@ WRITE8_DEVICE_HANDLER( turbo_sound_b_w ) WRITE8_DEVICE_HANDLER( turbo_sound_c_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; /* OSEL1-2 */ @@ -325,7 +325,7 @@ INLINE void subroc3d_update_volume(const device_config *samples, int leftchan, U WRITE8_DEVICE_HANDLER( subroc3d_sound_b_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; @@ -381,7 +381,7 @@ WRITE8_DEVICE_HANDLER( subroc3d_sound_b_w ) WRITE8_DEVICE_HANDLER( subroc3d_sound_c_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; UINT8 diff = data ^ state->sound_state[2]; state->sound_state[2] = data; @@ -506,7 +506,7 @@ static void buckrog_update_samples(turbo_state *state, const device_config *samp WRITE8_DEVICE_HANDLER( buckrog_sound_a_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; UINT8 diff = data ^ state->sound_state[0]; state->sound_state[0] = data; @@ -532,7 +532,7 @@ WRITE8_DEVICE_HANDLER( buckrog_sound_a_w ) WRITE8_DEVICE_HANDLER( buckrog_sound_b_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); turbo_state *state = device->machine->driver_data; UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c index 7531740b373..72d6518a41f 100644 --- a/src/mame/audio/tx1.c +++ b/src/mame/audio/tx1.c @@ -412,8 +412,8 @@ WRITE8_DEVICE_HANDLER( bb_ym2_a_w ) WRITE8_DEVICE_HANDLER( bb_ym2_b_w ) { - const device_config *ym1 = devtag_get_device(device->machine, SOUND, "ym1"); - const device_config *ym2 = devtag_get_device(device->machine, SOUND, "ym2"); + const device_config *ym1 = devtag_get_device(device->machine, "ym1"); + const device_config *ym2 = devtag_get_device(device->machine, "ym2"); double gain; stream_update(stream); diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c index c93d70998b2..adfe61fd207 100644 --- a/src/mame/audio/vicdual.c +++ b/src/mame/audio/vicdual.c @@ -132,7 +132,7 @@ MACHINE_DRIVER_END static TIMER_CALLBACK( frogs_croak_callback ) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(machine, "samples"); sample_stop(samples, 2); } @@ -145,8 +145,8 @@ MACHINE_START( frogs_audio ) WRITE8_HANDLER( frogs_audio_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); static int last_croak = 0; static int last_buzzz = 0; int new_croak = data & 0x08; @@ -462,7 +462,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( headon_audio_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); if (discrete == NULL) return; discrete_sound_w(discrete, HEADON_HISPEED_PC_EN, data & 0x01); @@ -477,7 +477,7 @@ WRITE8_HANDLER( headon_audio_w ) WRITE8_HANDLER( invho2_audio_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); if (discrete == NULL) return; discrete_sound_w(discrete, HEADON_HISPEED_PC_EN, data & 0x10); diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index f05092f14d2..59bda9c00cb 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -100,10 +100,10 @@ static WRITE8_HANDLER( narc_slave_sync_w ); /* CVSD readmem/writemem structures */ static ADDRESS_MAP_START( williams_cvsd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x1ffe) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x1ffe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x1ffc) AM_READWRITE(cvsd_pia_r, cvsd_pia_w) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_DEVWRITE(SOUND, "cvsd", cvsd_digit_clock_clear_w) - AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_DEVWRITE(SOUND, "cvsd", cvsd_clock_set_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_DEVWRITE("cvsd", cvsd_digit_clock_clear_w) + AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_DEVWRITE("cvsd", cvsd_clock_set_w) AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_WRITE(cvsd_bank_select_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(5) ADDRESS_MAP_END @@ -112,10 +112,10 @@ ADDRESS_MAP_END /* NARC master readmem/writemem structures */ static ADDRESS_MAP_START( williams_narc_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x03fe) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_talkback_w) AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_WRITE(narc_command2_w) - AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_DEVWRITE(SOUND, "dac1", dac_w) + AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_DEVWRITE("dac1", dac_w) AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(narc_command_r) AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_bank_select_w) AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(narc_master_sync_w) @@ -126,10 +126,10 @@ ADDRESS_MAP_END /* NARC slave readmem/writemem structures */ static ADDRESS_MAP_START( williams_narc_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_DEVWRITE(SOUND, "cvsd", cvsd_clock_set_w) - AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_DEVWRITE(SOUND, "cvsd", cvsd_digit_clock_clear_w) + AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_DEVWRITE("cvsd", cvsd_clock_set_w) + AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_DEVWRITE("cvsd", cvsd_digit_clock_clear_w) AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_talkback_w) - AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_DEVWRITE(SOUND, "dac2", dac_w) + AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_DEVWRITE("dac2", dac_w) AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(narc_command2_r) AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_bank_select_w) AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_sync_w) @@ -142,11 +142,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( williams_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_WRITE(adpcm_bank_select_w) - AM_RANGE(0x2400, 0x2401) AM_MIRROR(0x03fe) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_DEVWRITE(SOUND, "dac", dac_w) - AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x2400, 0x2401) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_DEVWRITE("dac", dac_w) + AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_READ(adpcm_command_r) - AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_DEVWRITE(SOUND, "oki", adpcm_6295_bank_select_w) + AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_DEVWRITE("oki", adpcm_6295_bank_select_w) AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(adpcm_talkback_w) AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(5) AM_RANGE(0xc000, 0xffff) AM_ROMBANK(6) @@ -157,7 +157,7 @@ ADDRESS_MAP_END /* PIA structure */ static WRITE8_HANDLER( dac_0_data_w ) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), data); + dac_data_w(devtag_get_device(space->machine, "dac"), data); } static const pia6821_interface cvsd_pia_intf = @@ -383,7 +383,7 @@ void williams_adpcm_init(running_machine *machine) static void init_audio_state(running_machine *machine) { /* reset the YM2151 state */ - devtag_reset(machine, SOUND, "ym"); + devtag_reset(machine, "ym"); /* clear all the interrupts */ williams_sound_int_state = 0; diff --git a/src/mame/audio/wow.c b/src/mame/audio/wow.c index ad35a0a1fac..abefb9213a5 100644 --- a/src/mame/audio/wow.c +++ b/src/mame/audio/wow.c @@ -108,7 +108,7 @@ static int plural; READ8_HANDLER( wow_speech_r ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int Phoneme,Intonation; int i = 0; @@ -177,6 +177,6 @@ READ8_HANDLER( wow_speech_r ) CUSTOM_INPUT( wow_speech_status_r ) { - const device_config *samples = devtag_get_device(field->port->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(field->port->machine, "samples"); return !sample_playing(samples, 0); } diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c index 44261f47258..70c2a16d78b 100644 --- a/src/mame/audio/zaxxon.c +++ b/src/mame/audio/zaxxon.c @@ -123,7 +123,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( zaxxon_sound_a_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[0]; sound_state[0] = data; @@ -158,7 +158,7 @@ WRITE8_DEVICE_HANDLER( zaxxon_sound_a_w ) WRITE8_DEVICE_HANDLER( zaxxon_sound_b_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[1]; sound_state[1] = data; @@ -175,7 +175,7 @@ WRITE8_DEVICE_HANDLER( zaxxon_sound_b_w ) WRITE8_DEVICE_HANDLER( zaxxon_sound_c_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[2]; sound_state[2] = data; @@ -232,7 +232,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( congo_sound_b_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[1]; sound_state[1] = data; @@ -245,7 +245,7 @@ WRITE8_DEVICE_HANDLER( congo_sound_b_w ) WRITE8_DEVICE_HANDLER( congo_sound_c_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); UINT8 diff = data ^ sound_state[2]; sound_state[2] = data; diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 655c27c529b..4bc8ac6f477 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -138,8 +138,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index b19ae69128c..57f25524031 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -85,8 +85,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xe002, 0xe003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index f02e697c25b..9b1b9eef712 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -124,8 +124,8 @@ static WRITE16_HANDLER( k3_scrolly_w ) static WRITE16_HANDLER( k3_soundbanks_w ) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), (data & 4) ? 0x40000 : 0); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), (data & 2) ? 0x40000 : 0); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), (data & 4) ? 0x40000 : 0); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), (data & 2) ? 0x40000 : 0); } @@ -146,8 +146,8 @@ static ADDRESS_MAP_START( k3_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_READ_PORT("INPUTS") AM_RANGE(0x440000, 0x440001) AM_READ_PORT("SYSTEM") AM_RANGE(0x480000, 0x480001) AM_READ_PORT("DSW") - AM_RANGE(0x4c0000, 0x4c0001) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0xff00) - AM_RANGE(0x500000, 0x500001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0x4c0000, 0x4c0001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0x500000, 0x500001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0xff00) AM_RANGE(0x8c0000, 0x8cffff) AM_RAM // not used? ADDRESS_MAP_END diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 2eebb48ca9a..dab5f5a45fd 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -199,9 +199,9 @@ static ADDRESS_MAP_START( 20pacgal_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0a000, 0x0ffff) AM_MIRROR(0x40000) AM_ROM AM_RANGE(0x10000, 0x3ffff) AM_ROM AM_RANGE(0x44000, 0x447ff) AM_RAM AM_BASE_MEMBER(_20pacgal_state, video_ram) - AM_RANGE(0x45040, 0x4505f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&namco_soundregs) + AM_RANGE(0x45040, 0x4505f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x44800, 0x45eff) AM_RAM - AM_RANGE(0x45f00, 0x45fff) AM_DEVWRITE(SOUND, "namco", _20pacgal_wavedata_w) AM_BASE(&namco_wavedata) + AM_RANGE(0x45f00, 0x45fff) AM_DEVWRITE("namco", _20pacgal_wavedata_w) AM_BASE(&namco_wavedata) 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(SMH_ROM, rom_48000_w) /* this should be a mirror of 08000-09ffff */ @@ -231,7 +231,7 @@ static ADDRESS_MAP_START( 20pacgal_io_map, ADDRESS_SPACE_IO, 8 ) 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_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0x89, 0x89) AM_DEVWRITE("dac", dac_signed_w) 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) diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index b4e7f57c675..d426837745c 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -234,7 +234,7 @@ 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_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x502000, 0x503fff) AM_RAM - AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8(SOUND, "ym", ym2610_r, ym2610_w, 0x00ff) + AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8("ym", ym2610_r, ym2610_w, 0x00ff) AM_RANGE(0x60000c, 0x60000d) AM_RAM AM_RANGE(0x60000e, 0x60000f) AM_RAM AM_RANGE(0x700000, 0x70000f) AM_READWRITE(drill_io_r,drill_io_w) AM_BASE(&iodata) // i/o diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 127b3329d0e..be50ad1340d 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -780,14 +780,14 @@ static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE(SOUND, "msm", msm5232_w) - AM_RANGE(0xcc00, 0xcc00) AM_DEVWRITE(SOUND, "msm", sound_control_0_w) - AM_RANGE(0xce00, 0xce00) AM_DEVWRITE(SOUND, "msm", sound_control_1_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE("msm", msm5232_w) + AM_RANGE(0xcc00, 0xcc00) AM_DEVWRITE("msm", sound_control_0_w) + AM_RANGE(0xce00, 0xce00) AM_DEVWRITE("msm", sound_control_1_w) AM_RANGE(0xd800, 0xd800) AM_READWRITE(soundlatch_r, to_main_w) AM_RANGE(0xda00, 0xda00) AM_READNOP AM_WRITE(nmi_enable_w) /* unknown read */ AM_RANGE(0xdc00, 0xdc00) AM_WRITE(nmi_disable_w) - AM_RANGE(0xde00, 0xde00) AM_READNOP AM_DEVWRITE(SOUND, "dac", dac_signed_w) /* signed 8-bit DAC - unknown read */ + AM_RANGE(0xde00, 0xde00) AM_READNOP AM_DEVWRITE("dac", dac_signed_w) /* signed 8-bit DAC - unknown read */ AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostics ROM */ ADDRESS_MAP_END @@ -1008,7 +1008,7 @@ static const ay8910_interface ay8910_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "ay", sound_control_2_w), + DEVCB_DEVICE_HANDLER("ay", sound_control_2_w), DEVCB_HANDLER(sound_control_3_w) }; diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index 2ce9e9e5ad5..aa2d2973875 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -85,7 +85,7 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS") AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM") AM_RANGE(0x23, 0x23) AM_WRITE(sound_data_w) - AM_RANGE(0x33, 0x33) AM_DEVWRITE(SOUND, "ay", sound_control_w) + AM_RANGE(0x33, 0x33) AM_DEVWRITE("ay", sound_control_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 0e8c64e4598..7398aeea7b4 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -323,8 +323,8 @@ static ADDRESS_MAP_START( astropal_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1") AM_RANGE(0x03, 0x03) AM_MIRROR(0x04) AM_READ_PORT("IN3") - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", invaders_audio_1_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", invaders_audio_2_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", invaders_audio_1_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", invaders_audio_2_w) AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -1178,11 +1178,11 @@ static MACHINE_START( polaris ) static ADDRESS_MAP_START( polaris_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") - AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE(SOUND, "discrete", polaris_sh_port_1_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("discrete", polaris_sh_port_1_w) AM_RANGE(0x03, 0x03) AM_READWRITE(mb14241_0_shift_result_r, mb14241_0_shift_data_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "discrete", polaris_sh_port_2_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("discrete", polaris_sh_port_2_w) AM_RANGE(0x05, 0x05) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", polaris_sh_port_3_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("discrete", polaris_sh_port_3_w) ADDRESS_MAP_END @@ -1534,7 +1534,7 @@ static ADDRESS_MAP_START( indianbt_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x05, 0x05) AM_WRITE(indianbt_sh_port_2_w) AM_RANGE(0x06, 0x06) AM_WRITENOP /* sound ? */ - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", indianbt_sh_port_3_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE("discrete", indianbt_sh_port_3_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c index 9a82facf3cc..c59fef42561 100644 --- a/src/mame/drivers/86lions.c +++ b/src/mame/drivers/86lions.c @@ -71,13 +71,13 @@ static READ8_HANDLER( test_r ) static READ8_HANDLER(lions_via_r) { - const device_config *via_0 = device_list_find_by_tag(space->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via_0 = devtag_get_device(space->machine, "via6522_0"); return via_r(via_0, offset); } static WRITE8_HANDLER(lions_via_w) { - const device_config *via_0 = device_list_find_by_tag(space->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via_0 = devtag_get_device(space->machine, "via6522_0"); via_w(via_0, offset, data); } @@ -85,11 +85,11 @@ static WRITE8_HANDLER(lions_via_w) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&lions_vram) AM_RANGE(0x0800, 0x0fff) AM_RAM - AM_RANGE(0x1800, 0x1800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x1801, 0x1801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x1800, 0x1800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x1801, 0x1801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x5000, 0x500f) AM_READWRITE(lions_via_r, lions_via_w) AM_RANGE(0x5300, 0x5300) AM_READ(test_r)//AM_READ_PORT("IN0") - AM_RANGE(0x5382, 0x5383) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x5382, 0x5383) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 5cdf4c10290..cc18628e096 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -114,14 +114,14 @@ static WRITE8_HANDLER( speech_control_w ) strcpy((char *)speech_chip, ( data & 4 ) ? "upd2" : "upd1"); - upd = devtag_get_device(space->machine, SOUND, (char *)speech_chip); + upd = devtag_get_device(space->machine, (char *)speech_chip); upd7759_reset_w( upd, data & 2 ); upd7759_start_w( upd, data & 1 ); } static WRITE8_HANDLER( speech_msg_w ) { - upd7759_port_w( devtag_get_device(space->machine, SOUND, (char *)speech_chip), 0, data ); + upd7759_port_w( devtag_get_device(space->machine, (char *)speech_chip), 0, data ); } static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -151,7 +151,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(speech_msg_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(speech_control_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index b8a70de57f5..bc079b80539 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -295,10 +295,10 @@ static READ16_HANDLER(ac_devices_r) return input_port_read(space->machine, "IN0"); case 0x0014/2: case 0x0016/2: - return okim6295_r(devtag_get_device(space->machine, SOUND, "oki1"),0); + return okim6295_r(devtag_get_device(space->machine, "oki1"),0); case 0x0018/2: case 0x001a/2: - return okim6295_r(devtag_get_device(space->machine, SOUND, "oki2"),0); + return okim6295_r(devtag_get_device(space->machine, "oki2"),0); case 0x0040/2: /* "Upper switch / Under Switch" @@ -378,19 +378,19 @@ static WRITE16_HANDLER(ac_devices_w) case 0x00/2: if (ACCESSING_BITS_0_7) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), 0x40000 * (data & 0x3)); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), 0x40000 * (data & 0x30) >> 4); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), 0x40000 * (data & 0x3)); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), 0x40000 * (data & 0x30) >> 4); } break; case 0x14/2: case 0x16/2: if(ACCESSING_BITS_0_7) - okim6295_w(devtag_get_device(space->machine, SOUND, "oki1"),0,data); + okim6295_w(devtag_get_device(space->machine, "oki1"),0,data); break; case 0x18/2: case 0x1a/2: if(ACCESSING_BITS_0_7) - okim6295_w(devtag_get_device(space->machine, SOUND, "oki2"),0,data); + okim6295_w(devtag_get_device(space->machine, "oki2"),0,data); break; case 0x1c/2: /*IRQ mask?*/ diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index c03dd78c4a7..af24c4b6d21 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -114,10 +114,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dec0_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x3800, 0x3800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x3800, 0x3800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index 08e336fdf47..34cc0ec72c1 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -194,7 +194,7 @@ static MACHINE_START( skattv ) static MACHINE_RESET( skattv ) { - skattv_devices.duart68681 = device_list_find_by_tag( machine->config->devicelist, DUART68681, "duart68681" ); + skattv_devices.duart68681 = devtag_get_device( machine, "duart68681" ); mux_data = 0; } @@ -376,9 +376,9 @@ static ADDRESS_MAP_START( skattv_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800082, 0x800083) AM_READWRITE(HD63484_data_r, HD63484_data_w) AM_RANGE(0x800100, 0x800101) AM_READWRITE(test_r,wh2_w) //related to input AM_RANGE(0x800140, 0x800141) AM_READ(t2_r) - AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) //18b too - AM_RANGE(0x800142, 0x800143) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) //18b too - AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff ) + AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) //18b too + AM_RANGE(0x800142, 0x800143) AM_DEVREAD8("ay", ay8910_r, 0x00ff) //18b too + AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff ) // AM_RANGE(0xffd246, 0xffd247) AM_READ(handler3_r) // AM_RANGE(0xffd248, 0xffd249) AM_READ(handler3_r) AM_RANGE(0xffc000, 0xffffff) AM_RAM @@ -386,7 +386,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( quickjac_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM - AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8( DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff ) + AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff ) AM_RANGE(0x800080, 0x800081) AM_READWRITE(HD63484_status_r, HD63484_address_w) // bad AM_RANGE(0x800082, 0x800083) AM_READWRITE(HD63484_data_r, HD63484_data_w) // bad AM_RANGE(0x800100, 0x8001ff) AM_READ(test_r) //18b too @@ -409,9 +409,9 @@ static ADDRESS_MAP_START( funland_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800082, 0x800083) AM_READWRITE(HD63484_data_r, HD63484_data_w) // AM_RANGE(0x800100, 0x8001ff) AM_READ(test_r) //18b too AM_RANGE(0x800140, 0x800141) AM_READ(t2_r) - AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) //18b too - AM_RANGE(0x800142, 0x800143) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) //18b too - AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff ) + AM_RANGE(0x800140, 0x800143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) //18b too + AM_RANGE(0x800142, 0x800143) AM_DEVREAD8("ay", ay8910_r, 0x00ff) //18b too + AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff ) AM_RANGE(0xfc0000, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index a7fd307bb9c..b163341cd1a 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -99,10 +99,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x9002, 0x9002) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0xa002, 0xa002) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x9002, 0x9002) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0xa002, 0xa002) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0xf000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 8abfa40140b..3bf36b0cc9f 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -175,8 +175,8 @@ static ADDRESS_MAP_START( pspikesb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w) - AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0xfff008, 0xfff009) AM_DEVWRITE(SOUND, "oki", pspikesb_oki_banking_w) + AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xfff008, 0xfff009) AM_DEVWRITE("oki", pspikesb_oki_banking_w) ADDRESS_MAP_END static ADDRESS_MAP_START( spikes91_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -211,7 +211,7 @@ static ADDRESS_MAP_START( pspikesc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w) AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_RANGE(0xfff004, 0xfff005) AM_WRITE(aerofgt_bg1scrolly_w) - AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) ADDRESS_MAP_END static ADDRESS_MAP_START( karatblz_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -363,9 +363,9 @@ static ADDRESS_MAP_START( aerfboo2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0fe004, 0x0fe005) AM_WRITE(aerofgt_bg2scrollx_w) AM_RANGE(0x0fe006, 0x0fe007) AM_WRITE(aerofgt_bg2scrolly_w) AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE(turbofrc_gfxbank_w) - AM_RANGE(0x0fe006, 0x0fe007) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0xff00) - AM_RANGE(0x0fe00e, 0x0fe00f) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) - AM_RANGE(0x0fe01e, 0x0fe01f) AM_DEVWRITE(SOUND, "oki", aerfboo2_okim6295_banking_w) + AM_RANGE(0x0fe006, 0x0fe007) AM_DEVREAD8("oki", okim6295_r, 0xff00) + AM_RANGE(0x0fe00e, 0x0fe00f) AM_DEVWRITE8("oki", okim6295_w, 0xff00) + AM_RANGE(0x0fe01e, 0x0fe01f) AM_DEVWRITE("oki", aerfboo2_okim6295_banking_w) // AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP // AM_RANGE(0x0fe012, 0x0fe013) AM_WRITE(aerfboot_soundlatch_w) AM_RANGE(0x0fe400, 0x0fe401) AM_WRITENOP // data for a crtc? @@ -399,12 +399,12 @@ static ADDRESS_MAP_START( turbofrc_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(aerofgt_sh_bankswitch_w) AM_RANGE(0x14, 0x14) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) ADDRESS_MAP_END static ADDRESS_MAP_START( aerofgt_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0x04, 0x04) AM_WRITE(aerofgt_sh_bankswitch_w) AM_RANGE(0x08, 0x08) AM_WRITE(pending_command_clear_w) AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r) @@ -414,15 +414,15 @@ static ADDRESS_MAP_START( aerfboot_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(aerfboot_okim6295_banking_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r,okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( wbbc97_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym", ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_NOP AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index c1978f3fb86..74a06a08669 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -418,8 +418,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0x04, 0x04) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x04, 0x04) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x06, 0x06) AM_READWRITE(soundcommand_r, soundcommand2_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 1ef64c61c34..759fd9bdaf5 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -50,11 +50,11 @@ static ADDRESS_MAP_START( ajax_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM F6 */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM 2128SL at D16 */ AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) /* 007232 bankswitch */ - AM_RANGE(0xa000, 0xa00d) AM_DEVREADWRITE(SOUND, "konami1", k007232_r, k007232_w) /* 007232 registers (chip 1) */ - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami2", k007232_r, k007232_w) /* 007232 registers (chip 2) */ - AM_RANGE(0xb80c, 0xb80c) AM_DEVWRITE(SOUND, "konami2", k007232_extvol_w) /* extra volume, goes to the 007232 w/ A11 */ + AM_RANGE(0xa000, 0xa00d) AM_DEVREADWRITE("konami1", k007232_r, k007232_w) /* 007232 registers (chip 1) */ + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami2", k007232_r, k007232_w) /* 007232 registers (chip 2) */ + AM_RANGE(0xb80c, 0xb80c) AM_DEVWRITE("konami2", k007232_extvol_w) /* extra volume, goes to the 007232 w/ A11 */ /* selecting a different latch for the external port */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) /* soundlatch_r */ ADDRESS_MAP_END @@ -187,12 +187,12 @@ static WRITE8_HANDLER( sound_bank_w ) /* banks # for the 007232 (chip 1) */ bank_A = ((data >> 1) & 0x01); bank_B = ((data >> 0) & 0x01); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami1"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami1"), bank_A, bank_B ); /* banks # for the 007232 (chip 2) */ bank_A = ((data >> 4) & 0x03); bank_B = ((data >> 2) & 0x03); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami2"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami2"), bank_A, bank_B ); } static void volume_callback0(const device_config *device, int v) diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index a9e3860d682..3b9739f6924 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -86,7 +86,7 @@ static VIDEO_START( alg ) static MACHINE_START( alg ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); serial_timer = timer_alloc(machine, response_timer, NULL); serial_timer_active = FALSE; diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index 06cc9679468..2f431fb5543 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -85,7 +85,7 @@ static WRITE8_DEVICE_HANDLER( aliens_snd_bankswitch_w ) int bank_A = ((data >> 1) & 0x01); int bank_B = ((data) & 0x01); - k007232_set_bank( devtag_get_device(device->machine, SOUND, "konami"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(device->machine, "konami"), bank_A, bank_B ); } @@ -107,9 +107,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( aliens_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM g04_b03.bin */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* soundlatch_r */ - AM_RANGE(0xe000, 0xe00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) + AM_RANGE(0xe000, 0xe00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index efd74020757..19f3bc56ad8 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -803,7 +803,7 @@ static ADDRESS_MAP_START( kyros_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) AM_RANGE(0xe002, 0xe002) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0xe004, 0xe004) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0xe006, 0xe00e) AM_WRITE(SMH_NOP) // soundboard I/O's, ignored /* reference only AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_NOP) // NMI: diminishing saw-tooth @@ -819,7 +819,7 @@ static ADDRESS_MAP_START( sstingry_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xc100, 0xc100) AM_READ(soundlatch_r) AM_RANGE(0xc102, 0xc102) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0xc104, 0xc104) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0xc104, 0xc104) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0xc106, 0xc10e) AM_WRITENOP // soundboard I/O's, ignored ADDRESS_MAP_END @@ -831,8 +831,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( alpha68k_I_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xe000, 0xe000) AM_READWRITE(soundlatch_r, soundlatch_clear_w) - AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE(SOUND, "ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "ym", ym3812_write_port_w) + AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ym", ym3812_write_port_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xfc00, 0xfc00) AM_RAM // unknown port ADDRESS_MAP_END @@ -847,31 +847,31 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, soundlatch_clear_w) - AM_RANGE(0x08, 0x08) AM_DEVWRITE(SOUND, "dac", dac_signed_w) - AM_RANGE(0x0a, 0x0b) AM_DEVWRITE(SOUND, "ym2", ym2413_w) - AM_RANGE(0x0c, 0x0d) AM_DEVWRITE(SOUND, "ym1", ym2203_w) + AM_RANGE(0x08, 0x08) AM_DEVWRITE("dac", dac_signed_w) + AM_RANGE(0x0a, 0x0b) AM_DEVWRITE("ym2", ym2413_w) + AM_RANGE(0x0c, 0x0d) AM_DEVWRITE("ym1", ym2203_w) AM_RANGE(0x0e, 0x0e) AM_WRITE(sound_bank_w) ADDRESS_MAP_END static ADDRESS_MAP_START( kyros_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x11) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym2", ym2203_w) - AM_RANGE(0x90, 0x91) AM_DEVWRITE(SOUND, "ym3", ym2203_w) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_w) + AM_RANGE(0x90, 0x91) AM_DEVWRITE("ym3", ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( jongbou_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w) AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( tnexspce_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "ym", ym3812_write_port_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) AM_RANGE(0x3b, 0x3b) AM_READNOP // unknown read port AM_RANGE(0x3d, 0x3d) AM_READNOP // unknown read port AM_RANGE(0x7b, 0x7b) AM_READNOP // unknown read port diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c index 1678076609c..fc7c8069fbd 100644 --- a/src/mame/drivers/ambush.c +++ b/src/mame/drivers/ambush.c @@ -75,10 +75,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_address_w) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_address_w) - AM_RANGE(0x81, 0x81) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_address_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_address_w) + AM_RANGE(0x81, 0x81) AM_DEVWRITE("ay2", ay8910_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index 82e34cda62b..b1748b54aa5 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -599,8 +599,8 @@ static ADDRESS_MAP_START( ampoker2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x35, 0x35) AM_WRITE (ampoker2_port35_w) /* see write handlers */ AM_RANGE(0x36, 0x36) AM_WRITE (ampoker2_port36_w) /* see write handlers */ AM_RANGE(0x37, 0x37) AM_WRITE(ampoker2_watchdog_reset_w) - AM_RANGE(0x38, 0x39) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x3A, 0x3A) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x38, 0x39) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x3A, 0x3A) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index 719cef2b717..45d29f6c73d 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -95,7 +95,7 @@ static ADDRESS_MAP_START( amspdwy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xa800) AM_READ(amspdwy_wheel_0_r) // Player 1 AM_RANGE(0xac00, 0xac00) AM_READ(amspdwy_wheel_1_r) // Player 2 AM_RANGE(0xb000, 0xb000) AM_WRITENOP // ? Exiting IRQ - AM_RANGE(0xb400, 0xb400) AM_DEVREAD(SOUND, "ym", amspdwy_sound_r) AM_WRITE(amspdwy_sound_w) // YM2151 status, To Sound CPU + AM_RANGE(0xb400, 0xb400) AM_DEVREAD("ym", amspdwy_sound_r) AM_WRITE(amspdwy_sound_w) // YM2151 status, To Sound CPU AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)// Sprites AM_RANGE(0xe000, 0xe7ff) AM_RAM // Work RAM ADDRESS_MAP_END @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( amspdwy_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM // AM_RANGE(0x8000, 0x8000) AM_WRITENOP // ? Written with 0 at the start AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r) // From Main CPU - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) // + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // AM_RANGE(0xc000, 0xdfff) AM_RAM // Work RAM AM_RANGE(0xffff, 0xffff) AM_READNOP // ??? IY = FFFF at the start ? ADDRESS_MAP_END diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index 090bcddeb02..6a761ebda39 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -262,8 +262,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x40, 0x41) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0x80, 0x83) AM_READWRITE(angelkds_sub_sound_r, angelkds_sub_sound_w) // spcpostn ADDRESS_MAP_END diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 5bc267e4012..31a01224863 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -82,7 +82,7 @@ static void appoooh_adpcm_int(const device_config *device) /* adpcm address write */ static WRITE8_HANDLER( appoooh_adpcm_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, "msm"); + const device_config *adpcm = devtag_get_device(space->machine, "msm"); appoooh_adpcm_address = data << 8; msm5205_reset_w(adpcm,0); appoooh_adpcm_data = 0xffffffff; @@ -108,9 +108,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(appoooh_adpcm_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("BUTTON3") AM_WRITE(appoooh_out_w) AM_RANGE(0x05, 0x05) AM_WRITE(appoooh_scroll_w) /* unknown */ diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 818453b5b4d..3ad1b1c5f61 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -165,8 +165,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x02, 0x02) AM_DEVREADWRITE(SOUND, "oki", aquarium_oki_r, aquarium_oki_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", aquarium_oki_r, aquarium_oki_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_WRITE(aquarium_snd_ack_w) AM_RANGE(0x08, 0x08) AM_WRITE(aquarium_z80_bank_w) diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index 63915e5dec7..20c826c6c2e 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -230,8 +230,8 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index 818258567a0..a951fdce97d 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -129,7 +129,7 @@ static WRITE16_HANDLER( latch_w ) /* lower byte being modified? */ if (ACCESSING_BITS_0_7) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (data & 0x80) ? 0x40000 : 0x00000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (data & 0x80) ? 0x40000 : 0x00000); atarigen_set_oki6295_vol(space->machine, (data & 0x001f) * 100 / 0x1f); } } @@ -160,7 +160,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x640040, 0x64004f) AM_WRITE(latch_w) AM_RANGE(0x640060, 0x64006f) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x641000, 0x641fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0x642000, 0x642001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0x642000, 0x642001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) AM_RANGE(0x646000, 0x646fff) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0x647000, 0x647fff) AM_WRITE(watchdog_reset16_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index b8cce8ed193..ab06765b7f3 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -236,14 +236,14 @@ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( sound_portmap_1, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) ADDRESS_MAP_END #endif static ADDRESS_MAP_START( sound_portmap_2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c index 6ba0cbd9db4..2cb3f374e4d 100644 --- a/src/mame/drivers/aristmk5.c +++ b/src/mame/drivers/aristmk5.c @@ -45,7 +45,7 @@ static MACHINE_START( aristmk5 ) archimedes_init(machine); // reset the DAC to centerline - dac_signed_data_w(devtag_get_device(machine, SOUND, "dac"), 0x80); + dac_signed_data_w(devtag_get_device(machine, "dac"), 0x80); } static MACHINE_RESET( aristmk5 ) diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 59c8ea1f24d..6e6d2d53fff 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -484,8 +484,8 @@ int arkanoid_bootleg_id; static ADDRESS_MAP_START( arkanoid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xd001, 0xd001) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */ AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM") /* 2 bits from the 68705 */ AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w) @@ -499,8 +499,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xd001, 0xd001) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */ AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM") AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w) diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index c2aa5807ade..a381f7b7bd6 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -427,9 +427,9 @@ static READ8_HANDLER( soundlatch_clear_r ) static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x0, 0x1) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0x2, 0x2) AM_DEVWRITE(SOUND, "dac1", dac_signed_w) - AM_RANGE(0x3, 0x3) AM_DEVWRITE(SOUND, "dac2", dac_signed_w) + AM_RANGE(0x0, 0x1) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w) + AM_RANGE(0x3, 0x3) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x4, 0x4) AM_READ(soundlatch_clear_r) AM_RANGE(0x6, 0x6) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c index f48f2c40fb4..a3c239595bf 100644 --- a/src/mame/drivers/artmagic.c +++ b/src/mame/drivers/artmagic.c @@ -116,7 +116,7 @@ static WRITE16_HANDLER( control_w ) /* OKI banking here */ if (offset == 0) - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (((data >> 4) & 1) * 0x40000) % memory_region_length(space->machine, "oki")); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (((data >> 4) & 1) * 0x40000) % memory_region_length(space->machine, "oki")); logerror("%06X:control_w(%d) = %04X\n", cpu_get_pc(space->cpu), offset, data); } @@ -421,7 +421,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x30000a, 0x30000b) AM_READ_PORT("30000a") AM_RANGE(0x300000, 0x300003) AM_WRITE(control_w) AM_BASE(&control) AM_RANGE(0x300004, 0x300007) AM_WRITE(protection_bit_w) - AM_RANGE(0x360000, 0x360001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x360000, 0x360001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x380000, 0x380007) AM_READWRITE(tms_host_r, tms_host_w) ADDRESS_MAP_END @@ -440,7 +440,7 @@ static ADDRESS_MAP_START( stonebal_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x30000e, 0x30000f) AM_READ_PORT("30000e") AM_RANGE(0x300000, 0x300003) AM_WRITE(control_w) AM_BASE(&control) AM_RANGE(0x300004, 0x300007) AM_WRITE(protection_bit_w) - AM_RANGE(0x340000, 0x340001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x340000, 0x340001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x380000, 0x380007) AM_READWRITE(tms_host_r, tms_host_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 1bc0ebc991b..1a4d0ea134e 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -163,7 +163,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_w) AM_RANGE(0x04, 0x04) AM_READ(sound_latch_r) AM_RANGE(0x06, 0x06) AM_READ(sound_latch_status_r) @@ -317,7 +317,7 @@ static const ym2203_interface ym2203_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "msm", ym2203_write_a), + DEVCB_DEVICE_HANDLER("msm", ym2203_write_a), DEVCB_HANDLER(ym2203_write_b), }, ym2203_irq_handler diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index cf87e52a75b..f312ae3aa86 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -186,7 +186,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x380000, 0x380001) AM_READ_PORT("IN0") AM_RANGE(0x380002, 0x380003) AM_READ(control1_r) AM_RANGE(0x380100, 0x380101) AM_WRITE(control2_w) - AM_RANGE(0x380200, 0x380203) AM_DEVREADWRITE8(SOUND, "konami", asterix_sound_r, k053260_w, 0x00ff) + AM_RANGE(0x380200, 0x380203) AM_DEVREADWRITE8("konami", asterix_sound_r, k053260_w, 0x00ff) AM_RANGE(0x380300, 0x380301) AM_WRITE(sound_irq_w) AM_RANGE(0x380400, 0x380401) AM_WRITE(asterix_spritebank_w) AM_RANGE(0x380500, 0x38051f) AM_WRITE(K053251_lsb_w) @@ -201,10 +201,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf801, 0xf801) AM_DEVREADWRITE(SOUND, "ym", ym2151_status_port_r, ym2151_data_port_w) - AM_RANGE(0xfa00, 0xfa2f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xf801, 0xf801) AM_DEVREADWRITE("ym", ym2151_status_port_r, ym2151_data_port_w) + AM_RANGE(0xfa00, 0xfa2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE(SOUND, "ym", ym2151_register_port_w) + AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE("ym", ym2151_register_port_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index 7178e620046..3c8f3c83d06 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -227,10 +227,10 @@ static ADDRESS_MAP_START( asteroid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3000) AM_WRITE(avgdvg_go_w) AM_RANGE(0x3200, 0x3200) AM_WRITE(asteroid_bank_switch_w) AM_RANGE(0x3400, 0x3400) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x3600, 0x3600) AM_DEVWRITE(SOUND, "discrete", asteroid_explode_w) - AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE(SOUND, "discrete", asteroid_thump_w) - AM_RANGE(0x3c00, 0x3c05) AM_DEVWRITE(SOUND, "discrete", asteroid_sounds_w) - AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE(SOUND, "discrete", asteroid_noise_reset_w) + AM_RANGE(0x3600, 0x3600) AM_DEVWRITE("discrete", asteroid_explode_w) + AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE("discrete", asteroid_thump_w) + AM_RANGE(0x3c00, 0x3c05) AM_DEVWRITE("discrete", asteroid_sounds_w) + AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE("discrete", asteroid_noise_reset_w) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x4000) AM_RANGE(0x5000, 0x57ff) AM_ROM /* vector rom */ AM_RANGE(0x6800, 0x7fff) AM_ROM @@ -245,18 +245,18 @@ static ADDRESS_MAP_START( astdelux_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2007) AM_READ(asteroid_IN0_r) /* IN0 */ AM_RANGE(0x2400, 0x2407) AM_READ(asteroid_IN1_r) /* IN1 */ AM_RANGE(0x2800, 0x2803) AM_READ(asteroid_DSW1_r) /* DSW1 */ - AM_RANGE(0x2c00, 0x2c0f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) - AM_RANGE(0x2c40, 0x2c7f) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x2c00, 0x2c0f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) + AM_RANGE(0x2c40, 0x2c7f) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x3000, 0x3000) AM_WRITE(avgdvg_go_w) - AM_RANGE(0x3200, 0x323f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) + AM_RANGE(0x3200, 0x323f) AM_DEVWRITE("earom", atari_vg_earom_w) AM_RANGE(0x3400, 0x3400) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x3600, 0x3600) AM_DEVWRITE(SOUND, "discrete", asteroid_explode_w) - AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x3600, 0x3600) AM_DEVWRITE("discrete", asteroid_explode_w) + AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) AM_RANGE(0x3c00, 0x3c01) AM_WRITE(astdelux_led_w) - AM_RANGE(0x3c03, 0x3c03) AM_DEVWRITE(SOUND, "discrete", astdelux_sounds_w) + AM_RANGE(0x3c03, 0x3c03) AM_DEVWRITE("discrete", astdelux_sounds_w) AM_RANGE(0x3c04, 0x3c04) AM_WRITE(astdelux_bank_switch_w) AM_RANGE(0x3c05, 0x3c07) AM_WRITE(astdelux_coin_counter_w) - AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE(SOUND, "discrete", asteroid_noise_reset_w) + AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE("discrete", asteroid_noise_reset_w) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x4000) AM_RANGE(0x4800, 0x57ff) AM_ROM /* vector rom */ AM_RANGE(0x6000, 0x7fff) AM_ROM @@ -273,8 +273,8 @@ static ADDRESS_MAP_START( llander_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3000) AM_WRITE(avgdvg_go_w) AM_RANGE(0x3200, 0x3200) AM_WRITE(llander_led_w) AM_RANGE(0x3400, 0x3400) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x3c00, 0x3c00) AM_DEVWRITE(SOUND, "discrete", llander_sounds_w) - AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE(SOUND, "discrete", llander_snd_reset_w) + AM_RANGE(0x3c00, 0x3c00) AM_DEVWRITE("discrete", llander_sounds_w) + AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE("discrete", llander_snd_reset_w) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x4000) AM_RANGE(0x4800, 0x5fff) AM_ROM /* vector rom */ AM_RANGE(0x6000, 0x7fff) AM_ROM diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 60beea5b56a..235b2f0e808 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -231,9 +231,9 @@ static READ8_HANDLER( kamikaze_ppi_r ) /* the address lines are used for /CS; yes, they can overlap! */ if (!(offset & 4)) - result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset); + result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), offset); if (!(offset & 8)) - result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset); + result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), offset); return result; } @@ -242,9 +242,9 @@ static WRITE8_HANDLER( kamikaze_ppi_w ) { /* the address lines are used for /CS; yes, they can overlap! */ if (!(offset & 4)) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), offset, data); if (!(offset & 8)) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), offset, data); } @@ -257,7 +257,7 @@ static WRITE8_HANDLER( kamikaze_ppi_w ) static WRITE8_DEVICE_HANDLER( astinvad_sound1_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); int bits_gone_hi = data & ~sound_state[0]; sound_state[0] = data; @@ -274,7 +274,7 @@ static WRITE8_DEVICE_HANDLER( astinvad_sound1_w ) static WRITE8_DEVICE_HANDLER( astinvad_sound2_w ) { - const device_config *samples = devtag_get_device(device->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(device->machine, "samples"); int bits_gone_hi = data & ~sound_state[1]; sound_state[1] = data; @@ -290,7 +290,7 @@ static WRITE8_DEVICE_HANDLER( astinvad_sound2_w ) static WRITE8_HANDLER( spaceint_sound1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bits_gone_hi = data & ~sound_state[0]; sound_state[0] = data; @@ -309,7 +309,7 @@ static WRITE8_HANDLER( spaceint_sound1_w ) static WRITE8_HANDLER( spaceint_sound2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int bits_gone_hi = data & ~sound_state[1]; sound_state[1] = data; diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index 49015067bd8..a536c6239cd 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -206,7 +206,7 @@ static WRITE8_HANDLER( seawolf2_lamps_w ) static WRITE8_HANDLER( seawolf2_sound_1_w ) // Port 40 { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_1_last; port_1_last = data; @@ -221,7 +221,7 @@ static WRITE8_HANDLER( seawolf2_sound_1_w ) // Port 40 static WRITE8_HANDLER( seawolf2_sound_2_w ) // Port 41 { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); UINT8 rising_bits = data & ~port_2_last; port_2_last = data; @@ -336,8 +336,8 @@ static READ8_HANDLER( gorf_io_1_r ) case 4: astrocade_sparkle[2] = data; break; case 5: astrocade_sparkle[3] = data; break; case 6: - sound_set_output_gain(devtag_get_device(space->machine, SOUND, "astrocade1"), 0, data ? 0.0 : 1.0); - sound_set_output_gain(devtag_get_device(space->machine, SOUND, "samples"), 0, data ? 1.0 : 0.0); + sound_set_output_gain(devtag_get_device(space->machine, "astrocade1"), 0, data ? 0.0 : 1.0); + sound_set_output_gain(devtag_get_device(space->machine, "samples"), 0, data ? 1.0 : 0.0); break; case 7: mame_printf_debug("io_1:%d\n", data); break; } @@ -681,7 +681,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map_stereo_pattern, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) - AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE(SOUND, "astrocade2", astrocade_sound_w) + AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE("astrocade2", astrocade_sound_w) AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w) AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w) ADDRESS_MAP_END @@ -689,7 +689,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map_16col_pattern, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w) - AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE(SOUND, "astrocade2", astrocade_sound_w) + AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE("astrocade2", astrocade_sound_w) AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w) AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE(profpac_page_select_w) AM_RANGE(0x00c3, 0x00c3) AM_MIRROR(0xff00) AM_READ(profpac_intercept_r) @@ -712,11 +712,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tenpin_sub_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x90, 0x93) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) AM_RANGE(0x97, 0x97) AM_READ(soundlatch_r) - AM_RANGE(0x98, 0x98) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x98, 0x98) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x9a, 0x9a) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x98, 0x98) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x98, 0x98) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x9a, 0x9a) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END @@ -1243,7 +1243,7 @@ static const samples_interface gorf_samples_interface = static const z80_daisy_chain tenpin_daisy_chain[] = { - { Z80CTC, "ctc" }, + { "ctc" }, { NULL } }; diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index 732b1acf407..a7baf8808c7 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -177,15 +177,15 @@ static ADDRESS_MAP_START( showhand_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x05e000, 0x05e001 ) AM_READ( astrocorp_eeprom_r ) AM_RANGE( 0x060000, 0x0601ff ) AM_RAM_WRITE( astrocorp_palette_w ) AM_BASE( &paletteram16 ) AM_RANGE( 0x070000, 0x073fff ) AM_RAM - AM_RANGE( 0x080000, 0x080001 ) AM_DEVWRITE( SOUND, "oki", astrocorp_sound_bank_w ) + AM_RANGE( 0x080000, 0x080001 ) AM_DEVWRITE( "oki", astrocorp_sound_bank_w ) AM_RANGE( 0x0a0000, 0x0a0001 ) AM_WRITE( astrocorp_enable_w ) - AM_RANGE( 0x0d0000, 0x0d0001 ) AM_READ( astrocorp_unk_r ) AM_DEVWRITE8( SOUND, "oki", okim6295_w, 0xff00 ) + AM_RANGE( 0x0d0000, 0x0d0001 ) AM_READ( astrocorp_unk_r ) AM_DEVWRITE8( "oki", okim6295_w, 0xff00 ) ADDRESS_MAP_END static ADDRESS_MAP_START( showhanc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x000000, 0x01ffff ) AM_ROM AM_RANGE( 0x060000, 0x0601ff ) AM_RAM_WRITE( astrocorp_palette_w ) AM_BASE( &paletteram16 ) - AM_RANGE( 0x070000, 0x070001 ) AM_DEVWRITE( SOUND, "oki", astrocorp_sound_bank_w ) + AM_RANGE( 0x070000, 0x070001 ) AM_DEVWRITE( "oki", astrocorp_sound_bank_w ) AM_RANGE( 0x080000, 0x080fff ) AM_RAM AM_BASE( &spriteram16 ) AM_SIZE( &spriteram_size ) AM_RANGE( 0x082000, 0x082001 ) AM_WRITE( SMH_NOP ) AM_RANGE( 0x084000, 0x084001 ) AM_READ_PORT( "INPUTS" ) @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( showhanc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x08e000, 0x08e001 ) AM_READ( astrocorp_eeprom_r ) AM_RANGE( 0x090000, 0x093fff ) AM_RAM AM_RANGE( 0x0a0000, 0x0a0001 ) AM_WRITE( astrocorp_enable_w ) - AM_RANGE( 0x0e0000, 0x0e0001 ) AM_READ( astrocorp_unk_r ) AM_DEVWRITE8( SOUND, "oki", okim6295_w, 0xff00 ) + AM_RANGE( 0x0e0000, 0x0e0001 ) AM_READ( astrocorp_unk_r ) AM_DEVWRITE8( "oki", okim6295_w, 0xff00 ) ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 12e4e8e3ab4..69ea21a77a8 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -393,7 +393,7 @@ static ADDRESS_MAP_START( bonzeadv_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ @@ -407,13 +407,13 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // 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) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "msm", asuka_msm5205_start_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "msm", asuka_msm5205_stop_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("msm", asuka_msm5205_start_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("msm", asuka_msm5205_stop_w) ADDRESS_MAP_END /* no MSM5205 */ @@ -421,7 +421,7 @@ static ADDRESS_MAP_START( cadash_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index 875c340ada7..dbe1104dfa1 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -429,9 +429,9 @@ static READ8_DEVICE_HANDLER( via_pb_r ) static const via6522_interface via_interface = { - /*inputs : A/B */ DEVCB_HANDLER(via_pa_r), DEVCB_DEVICE_HANDLER(SOUND, "tms", via_pb_r), + /*inputs : A/B */ DEVCB_HANDLER(via_pa_r), DEVCB_DEVICE_HANDLER("tms", via_pb_r), /*inputs : CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B */ DEVCB_HANDLER(via_pa_w), DEVCB_DEVICE_HANDLER(SOUND, "tms", via_pb_w), + /*outputs: A/B */ DEVCB_HANDLER(via_pa_w), DEVCB_DEVICE_HANDLER("tms", via_pb_w), /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, /*irq */ DEVCB_NULL }; @@ -493,12 +493,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE(VIA6522, "via6522_0", via_r, via_w) - AM_RANGE(0x1800, 0x1801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("via6522_0", via_r, via_w) + AM_RANGE(0x1800, 0x1801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x1810, 0x1810) AM_READWRITE(atarigen_6502_sound_r, atarigen_6502_sound_w) AM_RANGE(0x1820, 0x1820) AM_READ(switch_6502_r) AM_RANGE(0x1824, 0x1825) AM_WRITE(led_w) - AM_RANGE(0x1870, 0x187f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) + AM_RANGE(0x1870, 0x187f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 4fe68d50136..e7e3379753f 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -392,7 +392,7 @@ static READ8_HANDLER( switch_6502_r ) if (atarigen_cpu_to_sound_ready) result ^= 0x01; if (atarigen_sound_to_cpu_ready) result ^= 0x02; - if (!has_tms5220 || tms5220_ready_r(devtag_get_device(space->machine, SOUND, "tms"))) result ^= 0x04; + if (!has_tms5220 || tms5220_ready_r(devtag_get_device(space->machine, "tms"))) result ^= 0x04; if (!(input_port_read(space->machine, "1801") & 0x80)) result ^= 0x10; return result; @@ -406,7 +406,7 @@ static WRITE8_HANDLER( switch_6502_w ) if (has_tms5220) { data = 12 | ((data >> 5) & 1); - tms5220_set_frequency(devtag_get_device(space->machine, SOUND, "tms"), MASTER_CLOCK/4 / (16 - data) / 2); + tms5220_set_frequency(devtag_get_device(space->machine, "tms"), MASTER_CLOCK/4 / (16 - data) / 2); } } @@ -631,7 +631,7 @@ static WRITE8_HANDLER( sound_reset_w ) /* a large number of signals are reset when this happens */ atarigen_sound_io_reset(space->machine->cpu[1]); - devtag_reset(space->machine, SOUND, "ym"); + devtag_reset(space->machine, "ym"); mixer_w(space, 0, 0); tms5220_data = 0; tms5220_data_strobe = 0; @@ -688,7 +688,7 @@ static WRITE8_HANDLER( tms5220_strobe_w ) { if (!(offset & 1) && tms5220_data_strobe && has_tms5220) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); tms5220_data_w(tms, 0, tms5220_data); } tms5220_data_strobe = offset & 1; @@ -751,11 +751,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x2000) AM_RAM AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0x2000) AM_RAM AM_BASE((UINT8 **)&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x2780) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) + AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x2780) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) AM_RANGE(0x1810, 0x1813) AM_MIRROR(0x278c) AM_READ(leta_r) - AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x2780) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x2780) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x1840, 0x1840) AM_MIRROR(0x278f) AM_READ(switch_6502_r) - AM_RANGE(0x1850, 0x1851) AM_MIRROR(0x278e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x1850, 0x1851) AM_MIRROR(0x278e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x1860, 0x1860) AM_MIRROR(0x278f) AM_READ(sound_6502_r) AM_RANGE(0x1870, 0x1870) AM_MIRROR(0x2781) AM_WRITE(tms5220_w) AM_RANGE(0x1872, 0x1873) AM_MIRROR(0x2780) AM_WRITE(tms5220_strobe_w) diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 005290b1794..c030f17f727 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -209,8 +209,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE(&paletteram) AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_RAM_WRITE(nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x03e0) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x2810, 0x281f) AM_MIRROR(0x03e0) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x03e0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x2810, 0x281f) AM_MIRROR(0x03e0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(watchdog_reset_w) AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_WRITE(nvram_enable_w) AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(irq_ack_w) @@ -226,9 +226,9 @@ static ADDRESS_MAP_START( atetrsb2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE(&paletteram) AM_RANGE(0x2400, 0x25ff) AM_RAM_WRITE(nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x2802, 0x2802) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x2804, 0x2804) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x2806, 0x2806) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x2802, 0x2802) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x2804, 0x2804) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x2806, 0x2806) AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0x2808, 0x2808) AM_READ_PORT("IN0") AM_RANGE(0x2818, 0x2818) AM_READ_PORT("IN1") AM_RANGE(0x3000, 0x3000) AM_WRITE(watchdog_reset_w) diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index 4738e3430f4..f9ea92e4ad7 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -140,12 +140,12 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", avalnche_attract_enable_w) + AM_RANGE(0x4001, 0x4001) AM_MIRROR(0x0ff8) AM_DEVWRITE("discrete", avalnche_attract_enable_w) AM_RANGE(0x4002, 0x4002) AM_MIRROR(0x0ff8) AM_WRITE(avalance_video_invert_w) AM_RANGE(0x4003, 0x4003) AM_MIRROR(0x0ff8) AM_WRITE(avalance_credit_2_lamp_w) - AM_RANGE(0x4004, 0x4006) AM_MIRROR(0x0ff8) AM_DEVWRITE(SOUND, "discrete", avalnche_audio_w) + AM_RANGE(0x4004, 0x4006) AM_MIRROR(0x0ff8) AM_DEVWRITE("discrete", avalnche_audio_w) AM_RANGE(0x4007, 0x4007) AM_MIRROR(0x0ff8) AM_WRITE(avalance_start_lamp_w) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "discrete", avalnche_noise_amplitude_w) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("discrete", avalnche_noise_amplitude_w) AM_RANGE(0x6000, 0x7fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index ec725873665..600188adf4a 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -99,10 +99,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8800) AM_READ(aztarac_snd_command_r) - AM_RANGE(0x8c00, 0x8c01) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_address_w) - AM_RANGE(0x8c02, 0x8c03) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_address_w) - AM_RANGE(0x8c04, 0x8c05) AM_DEVREADWRITE(SOUND, "ay3", ay8910_r, ay8910_data_address_w) - AM_RANGE(0x8c06, 0x8c07) AM_DEVREADWRITE(SOUND, "ay4", ay8910_r, ay8910_data_address_w) + AM_RANGE(0x8c00, 0x8c01) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_address_w) + AM_RANGE(0x8c02, 0x8c03) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_address_w) + AM_RANGE(0x8c04, 0x8c05) AM_DEVREADWRITE("ay3", ay8910_r, ay8910_data_address_w) + AM_RANGE(0x8c06, 0x8c07) AM_DEVREADWRITE("ay4", ay8910_r, ay8910_data_address_w) AM_RANGE(0x9000, 0x9000) AM_READWRITE(aztarac_snd_status_r, aztarac_snd_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 553029a301d..2b6d87fdea9 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -169,8 +169,8 @@ static void draw_sprites(running_machine *machine,bitmap_t *bitmap,const rectang static VIDEO_UPDATE(backfire) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); /* screen 1 uses pf1 as the forground and pf3 as the background */ /* screen 2 uses pf2 as the foreground and pf4 as the background */ @@ -339,7 +339,7 @@ static ADDRESS_MAP_START( backfire_map, ADDRESS_SPACE_PROGRAM, 32 ) // AM_RANGE(0x1e8000, 0x1e8003) AM_READ(backfire_wheel1_r) // AM_RANGE(0x1e8004, 0x1e8007) AM_READ(backfire_wheel2_r) - AM_RANGE(0x1c0000, 0x1c0007) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0x000000ff) + AM_RANGE(0x1c0000, 0x1c0007) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x000000ff) ADDRESS_MAP_END diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 70ae194719f..199f511ebd1 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -337,7 +337,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2bff) AM_READWRITE(audio_io_r, audio_io_w) AM_RANGE(0x3000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index 39a4e2d2e02..4c40a1684a4 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -152,7 +152,7 @@ static WRITE8_HANDLER( bagman_ls259_w ) if (offset==3) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); if (ls259_buf[3] == 0) /* 1->0 transition */ { reset_talking(tms); @@ -221,14 +221,14 @@ static ADDRESS_MAP_START( pickin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP) /* ???? */ /* guess */ - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0xb800, 0xb800) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0xb800, 0xb800) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x09) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVREAD("ay", ay8910_r) //AM_RANGE(0x56, 0x56) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index ca398c70af4..817623708bf 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -127,9 +127,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bankp_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_RANGE(0x05, 0x05) AM_WRITE(bankp_scroll_w) AM_RANGE(0x07, 0x07) AM_WRITE(bankp_out_w) diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 99972d9aa28..4901ba0b454 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -178,7 +178,7 @@ static WRITE8_HANDLER( baraduke_irq_ack_w ) static ADDRESS_MAP_START( baraduke_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READWRITE(baraduke_spriteram_r,baraduke_spriteram_w) AM_BASE(&baraduke_spriteram) /* Sprite RAM */ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(baraduke_videoram_r,baraduke_videoram_w) AM_BASE(&baraduke_videoram) /* Video RAM */ - AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */ + AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */ AM_RANGE(0x4800, 0x4fff) AM_READWRITE(baraduke_textram_r,baraduke_textram_w) AM_BASE(&baraduke_textram)/* video RAM (text layer) */ AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0x8800, 0x8800) AM_WRITE(baraduke_irq_ack_w) /* irq acknowledge */ @@ -198,7 +198,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x001f) AM_READWRITE(hd63701_internal_registers_r,hd63701_internal_registers_w)/* internal registers */ AM_RANGE(0x0080, 0x00ff) AM_RAM /* built in RAM */ AM_RANGE(0x1105, 0x1105) AM_READ(soundkludge_r) /* cures speech */ - AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata)/* PSG device, shared RAM */ + AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata)/* PSG device, shared RAM */ 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? */ diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index dbc9928b127..bf1e9aa5da5 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -97,7 +97,7 @@ static ADDRESS_MAP_START( battlane_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1c01, 0x1c01) AM_READ_PORT("P2") AM_WRITE(battlane_scrollx_w) AM_RANGE(0x1c02, 0x1c02) AM_READ_PORT("DSW1") AM_WRITE(battlane_scrolly_w) AM_RANGE(0x1c03, 0x1c03) AM_READ_PORT("DSW2") AM_WRITE(battlane_cpu_command_w) - AM_RANGE(0x1c04, 0x1c05) AM_DEVREADWRITE(SOUND, "ym", ym3526_r, ym3526_w) + AM_RANGE(0x1c04, 0x1c05) AM_DEVREADWRITE("ym", ym3526_r, ym3526_w) AM_RANGE(0x1e00, 0x1e3f) AM_WRITE(battlane_palette_w) AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(battlane_bitmap_w) AM_SHARE(4) AM_RANGE(0x4000, 0xffff) AM_ROM diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index 1264affb67c..ed31b5cd184 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -119,11 +119,11 @@ static WRITE8_DEVICE_HANDLER( battlera_adpcm_reset_w ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM - AM_RANGE(0x040000, 0x040001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x040000, 0x040001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w) - AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE(SOUND, "c6280", c6280_w) + AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE("c6280", c6280_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(7) /* Main ram */ - AM_RANGE(0x1ff000, 0x1ff001) AM_READ(soundlatch_r) AM_DEVWRITE(SOUND, "msm", battlera_adpcm_reset_w) + AM_RANGE(0x1ff000, 0x1ff001) AM_READ(soundlatch_r) AM_DEVWRITE("msm", battlera_adpcm_reset_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index a749cf39f6e..ba3f8172856 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -85,7 +85,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(battlex_flipscreen_w) /* verify all of these */ - AM_RANGE(0x22, 0x23) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x22, 0x23) AM_DEVWRITE("ay", ay8910_data_address_w) /* 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 */ diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 9f19f5f45a4..1801b36f65a 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -71,8 +71,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( battlnts_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM 777c01.rom */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym1", ym3812_r, ym3812_w) /* YM3812 (chip 1) */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym2", ym3812_r, ym3812_w) /* YM3812 (chip 2) */ + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym1", ym3812_r, ym3812_w) /* YM3812 (chip 1) */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym2", ym3812_r, ym3812_w) /* YM3812 (chip 2) */ AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) /* soundlatch_r */ ADDRESS_MAP_END diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 2df5b443125..f660e8a500d 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -378,13 +378,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0xc0, 0xc1) AM_WRITE(SMH_NOP) /* -> Main CPU */ ADDRESS_MAP_END static ADDRESS_MAP_START( sounda_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2608_r, ym2608_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) AM_RANGE(0xc0, 0xc1) AM_WRITE(SMH_NOP) /* -> Main CPU */ ADDRESS_MAP_END diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index 1e9fdbbd264..05a0f4bbec3 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -23,7 +23,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM // AM_RANGE(0x1000, 0x10ff) AM_READWRITE(beezer_6840_r, beezer_6840_w) - AM_RANGE(0x1800, 0x18ff) AM_DEVREADWRITE(VIA6522, "via6522_1", via_r, via_w) + AM_RANGE(0x1800, 0x18ff) AM_DEVREADWRITE("via6522_1", via_r, via_w) // AM_RANGE(0x8000, 0x9fff) AM_WRITE(beezer_dac_w) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index 9a73daa2b9a..7ae523f5d94 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -475,7 +475,7 @@ static WRITE8_HANDLER( berzerk_audio_w ) { /* offset 4 writes to the S14001A */ case 4: - device = devtag_get_device(space->machine, SOUND, "speech"); + device = devtag_get_device(space->machine, "speech"); switch (data >> 6) { /* write data to the S14001 */ @@ -493,7 +493,7 @@ static WRITE8_HANDLER( berzerk_audio_w ) break; case 1: - device = devtag_get_device(space->machine, SOUND, "speech"); + device = devtag_get_device(space->machine, "speech"); /* volume */ s14001a_set_volume(device, ((data & 0x38) >> 3) + 1); @@ -525,7 +525,7 @@ static WRITE8_HANDLER( berzerk_audio_w ) static READ8_HANDLER( berzerk_audio_r ) { - const device_config *device = devtag_get_device(space->machine, SOUND, "speech"); + const device_config *device = devtag_get_device(space->machine, "speech"); return ((offset == 4) && !s14001a_bsy_r(device)) ? 0x40 : 0x00; } diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 5028ae0c9e5..f2484898d80 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -201,8 +201,8 @@ static ADDRESS_MAP_START( bestleag_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300014, 0x300015) AM_READ_PORT("P2") AM_RANGE(0x300016, 0x300017) AM_READ_PORT("DSWA") AM_RANGE(0x300018, 0x300019) AM_READ_PORT("DSWB") - AM_RANGE(0x30001c, 0x30001d) AM_DEVWRITE(SOUND, "oki", oki_bank_w) - AM_RANGE(0x30001e, 0x30001f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x30001c, 0x30001d) AM_DEVWRITE("oki", oki_bank_w) + AM_RANGE(0x30001e, 0x30001f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x304000, 0x304001) AM_WRITENOP AM_RANGE(0xfe0000, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 7fa57a19c83..c63bce3371e 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -1315,10 +1315,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x23) AM_READWRITE(chipset_r, chipset_w) - AM_RANGE(0x24, 0x24) AM_DEVWRITE(ACIA6850, "acia6850_0", acia6850_ctrl_w) - AM_RANGE(0x25, 0x25) AM_DEVWRITE(ACIA6850, "acia6850_0", acia6850_data_w) - AM_RANGE(0x26, 0x26) AM_DEVREAD(ACIA6850, "acia6850_0", acia6850_stat_r) - AM_RANGE(0x27, 0x27) AM_DEVREAD(ACIA6850, "acia6850_0", acia6850_data_r) + AM_RANGE(0x24, 0x24) AM_DEVWRITE("acia6850_0", acia6850_ctrl_w) + AM_RANGE(0x25, 0x25) AM_DEVWRITE("acia6850_0", acia6850_data_w) + AM_RANGE(0x26, 0x26) AM_DEVREAD("acia6850_0", acia6850_stat_r) + AM_RANGE(0x27, 0x27) AM_DEVREAD("acia6850_0", acia6850_data_r) AM_RANGE(0x30, 0x30) AM_READ(fdctrl_r) AM_RANGE(0x31, 0x31) AM_READWRITE(fddata_r, fdctrl_w) AM_RANGE(0x40, 0x40) AM_WRITE(rombank_w) @@ -1444,16 +1444,16 @@ static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_RAM // W AM_RANGE(0x2A00, 0x2A02) AM_READWRITE(latch_r, latch_w) AM_RANGE(0x2E00, 0x2E00) AM_READ(int_latch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x3201, 0x3201) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x3404, 0x3404) AM_DEVREADWRITE(ACIA6850, "acia6850_1", acia6850_stat_r, acia6850_ctrl_w) - AM_RANGE(0x3405, 0x3405) AM_DEVREADWRITE(ACIA6850, "acia6850_1", acia6850_data_r, acia6850_data_w) - AM_RANGE(0x3406, 0x3406) AM_DEVREADWRITE(ACIA6850, "acia6850_2", acia6850_stat_r, acia6850_ctrl_w) - AM_RANGE(0x3407, 0x3407) AM_DEVREADWRITE(ACIA6850, "acia6850_2", acia6850_data_r, acia6850_data_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3201, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x3404, 0x3404) AM_DEVREADWRITE("acia6850_1", acia6850_stat_r, acia6850_ctrl_w) + AM_RANGE(0x3405, 0x3405) AM_DEVREADWRITE("acia6850_1", acia6850_data_r, acia6850_data_w) + AM_RANGE(0x3406, 0x3406) AM_DEVREADWRITE("acia6850_2", acia6850_stat_r, acia6850_ctrl_w) + AM_RANGE(0x3407, 0x3407) AM_DEVREADWRITE("acia6850_2", acia6850_data_r, acia6850_data_w) // AM_RANGE(0x3408, 0x3408) AM_NOP // AM_RANGE(0x340A, 0x340A) AM_NOP // AM_RANGE(0x3600, 0x3600) AM_NOP - AM_RANGE(0x3801, 0x3801) AM_DEVREADWRITE(SOUND, "upd", upd_r, upd_w) + AM_RANGE(0x3801, 0x3801) AM_DEVREADWRITE("upd", upd_r, upd_w) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* Watchdog */ ADDRESS_MAP_END diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index 63a4e31e1c3..ce4f5b9591d 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -780,8 +780,8 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x3101, 0x3201) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0x3406, 0x3406) AM_READWRITE(aciastat_r,aciactrl_w) // MC6850 status register AM_RANGE(0x3407, 0x3407) AM_READWRITE(aciadata_r,aciadata_w) // MC6850 data register @@ -825,8 +825,8 @@ static ADDRESS_MAP_START( memmap_adder2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x3101, 0x3201) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0x3406, 0x3406) AM_READWRITE(aciastat_r,aciactrl_w) // MC6850 status register AM_RANGE(0x3407, 0x3407) AM_READWRITE(aciadata_r,aciadata_w) // MC6850 data register @@ -874,8 +874,8 @@ static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x3101, 0x3201) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3101, 0x3201) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0x3406, 0x3406) AM_READWRITE(aciastat_r,aciactrl_w) // MC6850 status register AM_RANGE(0x3407, 0x3407) AM_READWRITE(aciadata_r,aciadata_w) // MC6850 data register @@ -886,8 +886,8 @@ static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3600, 0x3600) AM_WRITE(bankswitch_w) // write bank - AM_RANGE(0x3801, 0x3801) AM_DEVREAD(SOUND, "upd", nec_r) - AM_RANGE(0x3800, 0x39FF) AM_DEVWRITE(SOUND, "upd", nec_latch_w) + AM_RANGE(0x3801, 0x3801) AM_DEVREAD("upd", nec_r) + AM_RANGE(0x3800, 0x39FF) AM_DEVWRITE("upd", nec_latch_w) AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK1) // 8k paged ROM (4 pages) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 61ed6fd521c..adbc4860730 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -339,7 +339,7 @@ static void on_scorpion2_reset(running_machine *machine) e2ram_reset(); - devtag_reset(machine, SOUND, "ym"); + devtag_reset(machine, "ym"); // reset stepper motors ///////////////////////////////////////////////// { @@ -698,8 +698,8 @@ static WRITE8_HANDLER( volume_override_w ) if ( old != volume_override ) { - const device_config *ym = devtag_get_device(space->machine, SOUND, "ym"); - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd"); + const device_config *ym = devtag_get_device(space->machine, "ym"); + const device_config *upd = devtag_get_device(space->machine, "upd"); float percent = volume_override? 1.0f : (32-global_volume)/32.0f; sound_set_output_gain(ym, 0, percent); @@ -776,7 +776,7 @@ static READ8_HANDLER( vfd_status_hop_r ) // on video games, hopper inputs are co } } - if ( !upd7759_busy_r(devtag_get_device(space->machine, SOUND, "upd")) ) result |= 0x80; // update sound busy input + if ( !upd7759_busy_r(devtag_get_device(space->machine, "upd")) ) result |= 0x80; // update sound busy input return result; } @@ -812,8 +812,8 @@ static WRITE8_HANDLER( expansion_latch_w ) } { - const device_config *ym = devtag_get_device(space->machine, SOUND, "ym"); - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd"); + const device_config *ym = devtag_get_device(space->machine, "ym"); + const device_config *upd = devtag_get_device(space->machine, "upd"); float percent = volume_override ? 1.0f : (32-global_volume)/32.0f; sound_set_output_gain(ym, 0, percent); @@ -1541,10 +1541,10 @@ static ADDRESS_MAP_START( memmap_vid, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_WRITE(vfd1_data_w) // vfd1 data AM_RANGE(0x2900, 0x2900) AM_WRITE(vfd_reset_w) // vfd1+vfd2 reset line - AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE(SOUND, "upd", nec_latch_w) // this is where it reads? - AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE(SOUND, "upd", nec_reset_w) // upd7759 reset line + AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) // this is where it reads? + AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) // upd7759 reset line AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) // custom chip unlock - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) // write bank (rom page select for 0x6000 - 0x7fff ) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) // vfd2 data @@ -2666,7 +2666,7 @@ static READ8_HANDLER( vfd_status_r ) int result = optic_pattern; - if ( !upd7759_busy_r(devtag_get_device(space->machine, SOUND, "upd")) ) result |= 0x80; + if ( !upd7759_busy_r(devtag_get_device(space->machine, "upd")) ) result |= 0x80; return result; } @@ -2680,7 +2680,7 @@ static READ8_HANDLER( vfd_status_dm01_r ) int result = optic_pattern; - if ( !upd7759_busy_r(devtag_get_device(space->machine, SOUND, "upd")) ) result |= 0x80; + if ( !upd7759_busy_r(devtag_get_device(space->machine, "upd")) ) result |= 0x80; if ( BFM_dm01_busy() ) result |= 0x40; @@ -2781,10 +2781,10 @@ static ADDRESS_MAP_START( sc2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_WRITE(vfd1_data_w) /* vfd1 data */ AM_RANGE(0x2900, 0x2900) AM_WRITE(vfd_reset_w) /* vfd1+vfd2 reset line */ - AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE(SOUND, "upd", nec_latch_w) - AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE(SOUND, "upd", nec_reset_w) + AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) + AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) /* custom chip unlock */ - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) /* write bank (rom page select for 0x6000 - 0x7fff ) */ AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) /* vfd2 data */ @@ -2830,10 +2830,10 @@ static ADDRESS_MAP_START( sc3_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_WRITE(vfd1_data_w) AM_RANGE(0x2900, 0x2900) AM_WRITE(vfd_reset_w) - AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE(SOUND, "upd", nec_latch_w) - AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE(SOUND, "upd", nec_reset_w) + AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) + AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) @@ -2879,10 +2879,10 @@ static ADDRESS_MAP_START( memmap_sc2_dm01, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_WRITE(vfd1_data_dm01_w) AM_RANGE(0x2900, 0x2900) AM_WRITE(vfd_reset_w) - AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE(SOUND, "upd", nec_latch_w) - AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE(SOUND, "upd", nec_reset_w) + AM_RANGE(0x2A00, 0x2AFF) AM_DEVWRITE("upd", nec_latch_w) + AM_RANGE(0x2B00, 0x2BFF) AM_DEVWRITE("upd", nec_reset_w) AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w) - AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x2D00, 0x2D01) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) AM_RANGE(0x3FFE, 0x3FFE) AM_READ( direct_input_r) diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 7f5e2b41e6b..3f1d0b86e22 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -414,15 +414,15 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2A01, 0x2A01) AM_READWRITE(mux_ctrl_r,mux_ctrl_w)// mux status register AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch ( MC6850 / timer ) - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x3001, 0x3001) AM_READNOP //sound latch - AM_RANGE(0x3200, 0x3200) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x3200, 0x3200) AM_DEVWRITE("ay", ay8910_address_w) - AM_RANGE(0x3402, 0x3402) AM_DEVWRITE(ACIA6850, "acia6850_0", acia6850_ctrl_w) - AM_RANGE(0x3403, 0x3403) AM_DEVWRITE(ACIA6850, "acia6850_0", acia6850_data_w) + AM_RANGE(0x3402, 0x3402) AM_DEVWRITE("acia6850_0", acia6850_ctrl_w) + AM_RANGE(0x3403, 0x3403) AM_DEVWRITE("acia6850_0", acia6850_data_w) - AM_RANGE(0x3406, 0x3406) AM_DEVREAD(ACIA6850, "acia6850_0", acia6850_stat_r) - AM_RANGE(0x3407, 0x3407) AM_DEVREAD(ACIA6850, "acia6850_0", acia6850_data_r) + AM_RANGE(0x3406, 0x3406) AM_DEVREAD("acia6850_0", acia6850_stat_r) + AM_RANGE(0x3407, 0x3407) AM_DEVREAD("acia6850_0", acia6850_data_r) AM_RANGE(0x3600, 0x3600) AM_WRITE(mux_enable_w) // mux enable diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index f0d714dc52e..da67281b047 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -140,8 +140,8 @@ static ADDRESS_MAP_START( main_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x99, 0x99) AM_WRITE(v9938_0_command_w) AM_READ(v9938_0_status_r) AM_RANGE(0x9a, 0x9a) AM_WRITE(v9938_0_palette_w) AM_RANGE(0x9b, 0x9b) AM_WRITE(v9938_0_register_w) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xa2, 0xa2) AM_DEVREAD(SOUND, "ay", ay8910_r) /* Dip-Switches routes here. */ + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xa2, 0xa2) AM_DEVREAD("ay", ay8910_r) /* Dip-Switches routes here. */ ADDRESS_MAP_END diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 87af3a1d754..1c1766bac2c 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -368,8 +368,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE(SOUND, "msm", msm5232_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) AM_RANGE(0xce00, 0xce00) AM_WRITE(SMH_NOP) AM_RANGE(0xd800, 0xd800) AM_READWRITE(sound_command_r, beg_fromsound_w) /* write to D800 sets bit 1 in status */ diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index d7ec2f762aa..4eb6a44718b 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -366,9 +366,9 @@ static READ8_HANDLER( soundlatch_clear_r ) static ADDRESS_MAP_START( soundport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x0, 0x1) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0x2, 0x2) AM_DEVWRITE(SOUND, "dac1", dac_signed_w) - AM_RANGE(0x3, 0x3) AM_DEVWRITE(SOUND, "dac2", dac_signed_w) + AM_RANGE(0x0, 0x1) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w) + AM_RANGE(0x3, 0x3) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x4, 0x4) AM_READ(soundlatch_clear_r) AM_RANGE(0x6, 0x6) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index b078d044955..b713d36644f 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -80,8 +80,8 @@ static ADDRESS_MAP_START( bigstrkb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xB00000, 0xB00001) AM_WRITENOP - AM_RANGE(0xE00000, 0xE00001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0xE00002, 0xE00003) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xE00000, 0xE00001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xE00002, 0xE00003) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0xE00008, 0xE00009) AM_WRITENOP AM_RANGE(0xE0000c, 0xE0000d) AM_WRITENOP diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 7be536c961a..9c6938cec94 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -110,9 +110,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "upd", bingoc_play_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "upd", upd7759_port_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", bingoc_play_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", upd7759_port_w) #if !SOUND_TEST AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) //soundlatch #else diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index d0d4a0cf8a8..94310650c8b 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -168,7 +168,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xc000, 0xc7ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index fa133fc9869..ef7cfbe2186 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -175,7 +175,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x840000, 0x840007) AM_WRITE(K056832_b_word_w) // VSCCS AM_RANGE(0x850000, 0x85001f) AM_WRITE(K054338_word_w) // CLTC AM_RANGE(0x870000, 0x8700ff) AM_WRITE(K055555_word_w) // PCU2 - AM_RANGE(0x880000, 0x880003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0xff00) + AM_RANGE(0x880000, 0x880003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0xff00) AM_RANGE(0xa00000, 0xa01fff) AM_READWRITE(K056832_ram_word_r, K056832_ram_word_w) // Graphic planes AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(paletteram16_xbgr_word_be_w) AM_BASE(&paletteram16) AM_RANGE(0xb04000, 0xb047ff) AM_READ(bishi_mirror_r) // bug in the ram/rom test? diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 3a5f4dc7a0e..fdd19ae8402 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -511,8 +511,8 @@ static ADDRESS_MAP_START( saklove_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( saklove_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0020, 0x0020) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) - AM_RANGE(0x0040, 0x0041) AM_DEVWRITE( SOUND, "ym", ym3812_w ) + AM_RANGE(0x0020, 0x0020) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) + AM_RANGE(0x0040, 0x0041) AM_DEVWRITE( "ym", ym3812_w ) AM_RANGE(0x0060, 0x0062) AM_WRITE( colordac_w ) @@ -530,7 +530,7 @@ static ADDRESS_MAP_START( saklove_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0307, 0x0307) AM_READ ( saklove_dsw_r ) AM_RANGE(0x0308, 0x0308) AM_WRITE( saklove_dsw_mask_w ) - AM_RANGE(0x0312, 0x0312) AM_READ( saklove_vblank_r ) AM_DEVWRITE( SOUND, "oki", saklove_oki_bank_w ) + AM_RANGE(0x0312, 0x0312) AM_READ( saklove_vblank_r ) AM_DEVWRITE( "oki", saklove_oki_bank_w ) // Peripheral Control Block AM_RANGE(0xff00, 0xffff) AM_READWRITE( am188em_regs_r, am188em_regs_w ) AM_BASE( &am188em_regs ) diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index 197ad394e87..0a8f94de2f5 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -155,10 +155,10 @@ static ADDRESS_MAP_START( bking_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x2fff) AM_ROM //only bking3 AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x4400, 0x4401) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x4401, 0x4401) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x4402, 0x4403) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x4403, 0x4403) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x4400, 0x4401) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x4401, 0x4401) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x4402, 0x4403) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x4403, 0x4403) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0x4800, 0x4800) AM_READ(soundlatch_r) AM_RANGE(0x4802, 0x4802) AM_READWRITE(bking_sndnmi_disable_r, bking_sndnmi_enable_w) AM_RANGE(0xe000, 0xefff) AM_ROM /* Space for diagnostic ROM */ @@ -424,7 +424,7 @@ static const ay8910_interface ay8910_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "dac", dac_signed_w), + DEVCB_DEVICE_HANDLER("dac", dac_signed_w), DEVCB_HANDLER(portb_w) }; diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index e3d013fa161..3a592f8844f 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -132,9 +132,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) /* YM2203 */ - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(SOUND, "upd", bladestl_speech_ctrl_w) /* UPD7759 */ - AM_RANGE(0x4000, 0x4000) AM_DEVREAD(SOUND, "upd", bladestl_speech_busy_r) /* UPD7759 */ + AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* YM2203 */ + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("upd", bladestl_speech_ctrl_w) /* UPD7759 */ + AM_RANGE(0x4000, 0x4000) AM_DEVREAD("upd", bladestl_speech_busy_r) /* UPD7759 */ AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0x8000, 0xffff) AM_ROM @@ -309,8 +309,8 @@ static const ym2203_interface ym2203_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "upd", upd7759_port_w), - DEVCB_DEVICE_HANDLER(SOUND, "upd", bladestl_port_B_w) + DEVCB_DEVICE_HANDLER("upd", upd7759_port_w), + DEVCB_DEVICE_HANDLER("upd", bladestl_port_B_w) }, NULL }; diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index daaf9354abd..9c84a7274d1 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -93,8 +93,8 @@ static ADDRESS_MAP_START( sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0xe002, 0xe003) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0xe002, 0xe003) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 7875ff6db5c..b2ec9bc1007 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -136,7 +136,7 @@ static ADDRESS_MAP_START( blmbycar_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700008, 0x700009) AM_READ(blmbycar_pot_wheel_r ) // Wheel (potentiometer) AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_NOP ) // ? Wheel AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w ) // Sound - AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) // Sound + AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound AM_RANGE(0x70006a, 0x70006b) AM_WRITE(blmbycar_pot_wheel_reset_w ) // Wheel (potentiometer) AM_RANGE(0x70007a, 0x70007b) AM_WRITE(blmbycar_pot_wheel_shift_w ) // ADDRESS_MAP_END @@ -171,7 +171,7 @@ static ADDRESS_MAP_START( watrball_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700008, 0x700009) AM_READ(waterball_unk_r ) // 0x0008 must toggle AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_NOP ) // ?? busy AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w ) // Sound - AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) // + AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index bbc13b10780..44090eb0cdd 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -120,7 +120,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READWRITE(blockade_input_port_0_r, blockade_coin_latch_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "discrete", blockade_sound_freq_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("discrete", blockade_sound_freq_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("IN2") AM_RANGE(0x04, 0x04) AM_WRITE(blockade_env_on_w) AM_RANGE(0x08, 0x08) AM_WRITE(blockade_env_off_w) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 75d0e5a91cb..c936fa5cf67 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) 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 8f0dbe47e43..37df0c7b850 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -67,8 +67,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index b0c6c1cb772..8ff9c5b7c1d 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -115,10 +115,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x2fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x6002, 0x6002) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8002, 0x8002) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x6002, 0x6002) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8002, 0x8002) AM_DEVREAD("ay2", ay8910_r) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 7a8136a10d1..e13dbe74311 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -215,13 +215,13 @@ static WRITE16_HANDLER( scroll_w ) static READ16_HANDLER(bmcbowl_via_r) { - const device_config *via_0 = device_list_find_by_tag(space->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via_0 = devtag_get_device(space->machine, "via6522_0"); return via_r(via_0, offset); } static WRITE16_HANDLER(bmcbowl_via_w) { - const device_config *via_0 = device_list_find_by_tag(space->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via_0 = devtag_get_device(space->machine, "via6522_0"); via_w(via_0, offset, data); } @@ -338,8 +338,8 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x092000, 0x09201f) AM_READWRITE(bmcbowl_via_r, bmcbowl_via_w) AM_RANGE(0x093000, 0x093003) AM_WRITE(SMH_NOP) // related to music - AM_RANGE(0x092800, 0x092803) AM_DEVWRITE8(SOUND, "ay", ay8910_data_address_w, 0xff00) - AM_RANGE(0x092802, 0x092803) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0xff00) + AM_RANGE(0x092800, 0x092803) AM_DEVWRITE8("ay", ay8910_data_address_w, 0xff00) + AM_RANGE(0x092802, 0x092803) AM_DEVREAD8("ay", ay8910_r, 0xff00) AM_RANGE(0x093802, 0x093803) AM_READ_PORT("IN0") AM_RANGE(0x095000, 0x095fff) AM_RAM AM_BASE((UINT16 **)&stats_ram) AM_SIZE(&stats_ram_size) /* 8 bit */ AM_RANGE(0x097000, 0x097001) AM_READ(SMH_NOP) @@ -348,7 +348,7 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1f0000, 0x1fffff) AM_RAM AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE(&bmcbowl_vid2) - AM_RANGE(0x28c000, 0x28c001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0x28c000, 0x28c001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) /* protection device*/ AM_RANGE(0x30c000, 0x30c001) AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index f75d18391df..6de317aec9b 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -487,8 +487,8 @@ static VIDEO_START(bnstars) static VIDEO_UPDATE(bnstars) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); bitmap_fill(priority_bitmap,cliprect,0); diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index 4c2f648147c..60f51833a4e 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -47,11 +47,11 @@ static WRITE8_HANDLER( bogeyman_8910_control_w ) // bit 5 goes to 8910 #0 BDIR pin if ((last & 0x20) == 0x20 && (data & 0x20) == 0x00) - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay1"), last >> 4, psg_latch); + ay8910_data_address_w(devtag_get_device(space->machine, "ay1"), last >> 4, psg_latch); // bit 7 goes to 8910 #1 BDIR pin if ((last & 0x80) == 0x80 && (data & 0x80) == 0x00) - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay2"), last >> 6, psg_latch); + ay8910_data_address_w(devtag_get_device(space->machine, "ay2"), last >> 6, psg_latch); last = data; } diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index 2588f07549a..2d6895bc9a0 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -168,9 +168,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x10, 0x11) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay3", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index bf79a970474..1ebd2f274a6 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -133,9 +133,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK8, SMH_BANK8) AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) @@ -284,8 +284,8 @@ static void sound_irq(const device_config *device, int state) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki2"), ((data & 2)>>1) * 0x40000); - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki1"), (data & 1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki2"), ((data & 2)>>1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki1"), (data & 1) * 0x40000); } static const ym2151_interface ym2151_config = diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 2b4d80d6821..c6df74ec59f 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -124,10 +124,10 @@ static WRITE8_HANDLER( sound_bank_w ) bank_A = ((data >> 0) & 0x03); bank_B = ((data >> 2) & 0x03); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami1"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami1"), bank_A, bank_B ); bank_A = ((data >> 4) & 0x03); bank_B = ((data >> 6) & 0x03); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami2"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami2"), bank_A, bank_B ); } @@ -155,8 +155,8 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) - AM_RANGE(0xa000, 0xa00d) AM_DEVREADWRITE(SOUND, "konami1", k007232_r, k007232_w) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami2", k007232_r, k007232_w) + AM_RANGE(0xa000, 0xa00d) AM_DEVREADWRITE("konami1", k007232_r, k007232_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami2", k007232_r, k007232_w) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) AM_RANGE(0xf000, 0xf000) AM_WRITE(nmi_enable_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index dd1c6313f55..9b3d34669da 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -138,9 +138,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ym2", ym3526_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym2", ym3526_w) AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) - AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x6000, 0x6001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index 01187c97de6..8d5106e252e 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -81,15 +81,15 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0802, 0x0802) AM_READ_PORT("IN1") AM_RANGE(0x0803, 0x0803) AM_READ_PORT("DSW") AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* Timer Reset */ - AM_RANGE(0x1010, 0x1010) AM_DEVWRITE(SOUND, "discrete", bsktball_bounce_w) /* Crowd Amp / Bounce */ + AM_RANGE(0x1010, 0x1010) AM_DEVWRITE("discrete", bsktball_bounce_w) /* Crowd Amp / Bounce */ 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 */ AM_RANGE(0x102a, 0x102b) AM_WRITE(bsktball_ld2_w) /* LD 2 */ - AM_RANGE(0x102c, 0x102d) AM_DEVWRITE(SOUND, "discrete", bsktball_noise_reset_w) /* Noise Reset */ + AM_RANGE(0x102c, 0x102d) AM_DEVWRITE("discrete", bsktball_noise_reset_w) /* Noise Reset */ AM_RANGE(0x102e, 0x102f) AM_WRITE(bsktball_nmion_w) /* NMI On */ - AM_RANGE(0x1030, 0x1030) AM_DEVWRITE(SOUND, "discrete", bsktball_note_w) /* Music Ckt Note Dvsr */ + AM_RANGE(0x1030, 0x1030) AM_DEVWRITE("discrete", bsktball_note_w) /* Music Ckt Note Dvsr */ AM_RANGE(0x1800, 0x1bbf) AM_RAM_WRITE(bsktball_videoram_w) AM_BASE(&videoram) /* DISPLAY */ AM_RANGE(0x1bc0, 0x1bff) AM_RAM AM_BASE(&bsktball_motion) AM_RANGE(0x1c00, 0x1cff) AM_RAM diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index d4cb9438f08..2c4d0a44f6d 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -501,10 +501,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM AM_BASE(&audio_rambase) - AM_RANGE(0x2000, 0x3fff) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x7fff) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x8000, 0x9fff) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x2000, 0x3fff) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x7fff) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x8000, 0x9fff) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0xa000, 0xbfff) AM_READ(audio_command_r) AM_RANGE(0xc000, 0xdfff) AM_WRITE(audio_nmi_enable_w) AM_RANGE(0xe000, 0xefff) AM_MIRROR(0x1000) AM_ROM @@ -512,10 +512,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( disco_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x4000, 0x4fff) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6fff) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x7000, 0x7fff) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x4000, 0x4fff) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6fff) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x7000, 0x7fff) AM_DEVWRITE("ay2", ay8910_address_w) 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 03061db7f87..31604acca97 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -146,7 +146,7 @@ static WRITE8_HANDLER( sound_int_state_w ) { /* top bit controls BSMT2000 reset */ if (!(sound_int_state & 0x80) && (data & 0x80)) - devtag_reset(space->machine, SOUND, "bsmt"); + devtag_reset(space->machine, "bsmt"); /* also clears interrupts */ cpu_set_input_line(space->machine->cpu[1], 0, CLEAR_LINE); @@ -224,7 +224,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_DEVWRITE(SOUND, "bsmt", bsmt2000_port_w) + AM_RANGE(0x0000, 0x7fff) AM_DEVWRITE("bsmt", bsmt2000_port_w) AM_RANGE(0x8000, 0x8000) AM_READWRITE(sound_data_r, sound_data_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(sound_int_state_w) AM_RANGE(0x8004, 0x8004) AM_READ(sound_data_ready_r) diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index fed9fc2f0b3..c77af2a44e8 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -310,8 +310,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym2", ym3526_r, ym3526_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym2", ym3526_r, ym3526_w) AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITENOP AM_RANGE(0xb001, 0xb001) AM_WRITE(bublbobl_sh_nmi_enable_w) AM_READNOP AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w) @@ -400,7 +400,7 @@ static ADDRESS_MAP_START( tokio_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x9800) AM_READNOP // ??? AM_RANGE(0xa000, 0xa000) AM_WRITE(bublbobl_sh_nmi_disable_w) AM_RANGE(0xa800, 0xa800) AM_WRITE(bublbobl_sh_nmi_enable_w) - AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0xe000, 0xffff) AM_ROM // space for diagnostic ROM? ADDRESS_MAP_END diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 71dfd92e9e3..67319668ce1 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -190,9 +190,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x4800, 0x4801) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x4802, 0x4803) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x4810, 0x481d) AM_DEVWRITE(SOUND, "msm", msm5232_w) + AM_RANGE(0x4800, 0x4801) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x4802, 0x4803) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x4810, 0x481d) AM_DEVWRITE("msm", msm5232_w) 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 */ diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c index a78e6d0c86f..e2670b40c18 100644 --- a/src/mame/drivers/bwidow.c +++ b/src/mame/drivers/bwidow.c @@ -355,9 +355,9 @@ static ADDRESS_MAP_START( bwidow_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x2000) AM_RANGE(0x2800, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0x67ff) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x6800, 0x6fff) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) - AM_RANGE(0x7000, 0x7000) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x6000, 0x67ff) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x6800, 0x6fff) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) + AM_RANGE(0x7000, 0x7000) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x7800, 0x7800) AM_READ_PORT("IN0") AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN3") AM_RANGE(0x8800, 0x8800) AM_READ_PORT("IN4") @@ -365,8 +365,8 @@ static ADDRESS_MAP_START( bwidow_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8840, 0x8840) AM_WRITE(avgdvg_go_w) AM_RANGE(0x8880, 0x8880) AM_WRITE(avgdvg_reset_w) AM_RANGE(0x88c0, 0x88c0) AM_WRITE(irq_ack_w) /* interrupt acknowledge */ - AM_RANGE(0x8900, 0x8900) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x8940, 0x897f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) + AM_RANGE(0x8900, 0x8900) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x8940, 0x897f) AM_DEVWRITE("earom", atari_vg_earom_w) AM_RANGE(0x8980, 0x89ed) AM_WRITE(SMH_NOP) /* watchdog clear */ AM_RANGE(0x9000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -377,16 +377,16 @@ static ADDRESS_MAP_START( spacduel_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0") AM_RANGE(0x0900, 0x0907) AM_READ(spacduel_IN3_r) /* IN1 */ AM_RANGE(0x0905, 0x0906) AM_WRITE(SMH_NOP) /* ignore? */ - AM_RANGE(0x0a00, 0x0a00) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x0a00, 0x0a00) AM_DEVREAD("earom", 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(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_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x0f00, 0x0f3f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x1400, 0x140f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x0e80, 0x0e80) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x0f00, 0x0f3f) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x1400, 0x140f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x2000) AM_RANGE(0x2800, 0x3fff) AM_ROM AM_RANGE(0x4000, 0xffff) AM_ROM diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 69eed4264c9..37ec2acf630 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -225,12 +225,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bwp3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x0200, 0x0200) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0x0200, 0x0200) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(bwp3_nmiack_w) - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(bwp3_nmimask_w) AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) AM_BASE(&bwp3_rombase) AM_SIZE(&bwp3_romsize) ADDRESS_MAP_END diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index f4813ce54d5..29202fe3b39 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -304,12 +304,12 @@ static ADDRESS_MAP_START( bzone_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x1800, 0x1800) AM_DEVREAD(MATHBOX, "mathbox", mathbox_status_r) - AM_RANGE(0x1810, 0x1810) AM_DEVREAD(MATHBOX, "mathbox", mathbox_lo_r) - AM_RANGE(0x1818, 0x1818) AM_DEVREAD(MATHBOX, "mathbox", mathbox_hi_r) - AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) + AM_RANGE(0x1800, 0x1800) AM_DEVREAD("mathbox", mathbox_status_r) + AM_RANGE(0x1810, 0x1810) AM_DEVREAD("mathbox", mathbox_lo_r) + AM_RANGE(0x1818, 0x1818) AM_DEVREAD("mathbox", mathbox_hi_r) + AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) AM_RANGE(0x1840, 0x1840) AM_WRITE(bzone_sounds_w) - AM_RANGE(0x1860, 0x187f) AM_DEVWRITE(MATHBOX, "mathbox", mathbox_go_w) + AM_RANGE(0x1860, 0x187f) AM_DEVWRITE("mathbox", mathbox_go_w) AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x2000) AM_RANGE(0x3000, 0x7fff) AM_ROM ADDRESS_MAP_END @@ -324,16 +324,16 @@ static ADDRESS_MAP_START( redbaron_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x1800, 0x1800) AM_DEVREAD(MATHBOX, "mathbox", mathbox_status_r) + AM_RANGE(0x1800, 0x1800) AM_DEVREAD("mathbox", mathbox_status_r) AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN4") - AM_RANGE(0x1804, 0x1804) AM_DEVREAD(MATHBOX, "mathbox", mathbox_lo_r) - AM_RANGE(0x1806, 0x1806) AM_DEVREAD(MATHBOX, "mathbox", mathbox_hi_r) + AM_RANGE(0x1804, 0x1804) AM_DEVREAD("mathbox", mathbox_lo_r) + AM_RANGE(0x1806, 0x1806) AM_DEVREAD("mathbox", mathbox_hi_r) AM_RANGE(0x1808, 0x1808) AM_WRITE(redbaron_sounds_w) /* and select joystick pot also */ AM_RANGE(0x180a, 0x180a) AM_WRITE(SMH_NOP) /* sound reset, yet todo */ - AM_RANGE(0x180c, 0x180c) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x1810, 0x181f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) - AM_RANGE(0x1820, 0x185f) AM_DEVREADWRITE(ATARIVGEAROM, "earom", atari_vg_earom_r, atari_vg_earom_w) - AM_RANGE(0x1860, 0x187f) AM_DEVWRITE(MATHBOX, "mathbox", mathbox_go_w) + AM_RANGE(0x180c, 0x180c) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x1810, 0x181f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) + AM_RANGE(0x1820, 0x185f) AM_DEVREADWRITE("earom", atari_vg_earom_r, atari_vg_earom_w) + AM_RANGE(0x1860, 0x187f) AM_DEVWRITE("mathbox", mathbox_go_w) AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("maincpu", 0x2000) AM_RANGE(0x3000, 0x7fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index 140577d3245..62b8631058a 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -188,16 +188,16 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x4005, 0x4006) AM_DEVWRITE(SOUND, "adpcm1", seibu_adpcm_adr_w) - AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x4005, 0x4006) AM_DEVWRITE("adpcm1", seibu_adpcm_adr_w) + AM_RANGE(0x4008, 0x4009) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) 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_PORT("COIN") AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) - AM_RANGE(0x401a, 0x401a) AM_DEVWRITE(SOUND, "adpcm1", seibu_adpcm_ctl_w) + AM_RANGE(0x401a, 0x401a) AM_DEVWRITE("adpcm1", seibu_adpcm_ctl_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) - AM_RANGE(0x6005, 0x6006) AM_DEVWRITE(SOUND, "adpcm2", seibu_adpcm_adr_w) - AM_RANGE(0x601a, 0x601a) AM_DEVWRITE(SOUND, "adpcm2", seibu_adpcm_ctl_w) + AM_RANGE(0x6005, 0x6006) AM_DEVWRITE("adpcm2", seibu_adpcm_adr_w) + AM_RANGE(0x601a, 0x601a) AM_DEVWRITE("adpcm2", seibu_adpcm_ctl_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -211,7 +211,7 @@ static ADDRESS_MAP_START( cabalbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4008, 0x4008) AM_READ(cabalbl_snd2_r) AM_RANGE(0x400a, 0x400a) AM_READ(cabalbl_snd1_r) AM_RANGE(0x400c, 0x400c) AM_WRITE(soundlatch2_w) - AM_RANGE(0x400e, 0x400f) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x400e, 0x400f) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -234,7 +234,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_talk1_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch3_r) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "msm1", cabalbl_adpcm_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm1", cabalbl_adpcm_w) ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_talk2_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -244,7 +244,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_talk2_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch4_r) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "msm2", cabalbl_adpcm_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm2", cabalbl_adpcm_w) ADDRESS_MAP_END /***************************************************************************/ diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index da4c6c086ce..4ab9a44f489 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -151,7 +151,7 @@ static ADDRESS_MAP_START( cabaret_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x00a2, 0x00a2 ) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE( 0x00b0, 0x00b0 ) AM_READ_PORT("DSW3") /* DSW3 */ - AM_RANGE( 0x00e0, 0x00e1 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE( 0x00e0, 0x00e1 ) AM_DEVWRITE( "ym", ym2413_w ) AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram ) AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE( fg_color_w ) AM_BASE( &fg_color_ram ) diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 80e34606815..d3f6f5ba3cc 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -752,13 +752,13 @@ static WRITE8_HANDLER( lamps_b_w ) static ADDRESS_MAP_START( sys903_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0840, 0x0841) AM_DEVWRITE(SOUND, "ay8912", ay8910_address_data_w) - AM_RANGE(0x0880, 0x0880) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0840, 0x0841) AM_DEVWRITE("ay8912", ay8910_address_data_w) + AM_RANGE(0x0880, 0x0880) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x08c4, 0x08c7) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0x08c8, 0x08cb) AM_READWRITE(pia_1_r, pia_1_w) - AM_RANGE(0x08d0, 0x08d0) AM_DEVREADWRITE(ACIA6850, "acia6850_0", acia6850_stat_r, acia6850_ctrl_w) - AM_RANGE(0x08d1, 0x08d1) AM_DEVREADWRITE(ACIA6850, "acia6850_0", acia6850_data_r, acia6850_data_w) + AM_RANGE(0x08d0, 0x08d0) AM_DEVREADWRITE("acia6850_0", acia6850_stat_r, acia6850_ctrl_w) + AM_RANGE(0x08d1, 0x08d1) AM_DEVREADWRITE("acia6850_0", acia6850_data_r, acia6850_data_w) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(calomega_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1800, 0x3fff) AM_ROM @@ -767,9 +767,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( s903mod_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0840, 0x0841) AM_DEVWRITE(SOUND, "ay8912", ay8910_address_data_w) - AM_RANGE(0x0880, 0x0880) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0840, 0x0841) AM_DEVWRITE("ay8912", ay8910_address_data_w) + AM_RANGE(0x0880, 0x0880) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x08c4, 0x08c7) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0x08c8, 0x08cb) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(&videoram) @@ -780,9 +780,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sys905_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x1040, 0x1041) AM_DEVWRITE(SOUND, "ay8912", ay8910_address_data_w) - AM_RANGE(0x1080, 0x1080) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x1081, 0x1081) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x1040, 0x1041) AM_DEVWRITE("ay8912", ay8910_address_data_w) + AM_RANGE(0x1080, 0x1080) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x1081, 0x1081) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x10c4, 0x10c7) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0x10c8, 0x10cb) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(&videoram) @@ -1979,7 +1979,7 @@ static MACHINE_DRIVER_START( sys905 ) MDRV_SOUND_CONFIG(sys905_ay8912_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - MDRV_DEVICE_REMOVE("acia6850_0", ACIA6850) + MDRV_DEVICE_REMOVE("acia6850_0") MACHINE_DRIVER_END static MACHINE_DRIVER_START( s903mod ) @@ -1994,7 +1994,7 @@ static MACHINE_DRIVER_START( s903mod ) MDRV_SOUND_CONFIG(sys905_ay8912_intf) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - MDRV_DEVICE_REMOVE("acia6850_0", ACIA6850) + MDRV_DEVICE_REMOVE("acia6850_0") MACHINE_DRIVER_END diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 7d9251707bf..82504095dc8 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -226,10 +226,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( calorie_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x10, 0x11) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x11, 0x11) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x11, 0x11) AM_DEVREAD("ay2", ay8910_r) // 3rd ? AM_RANGE(0x00, 0xff) AM_WRITE(bogus_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 86663e7752c..94654168bbf 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -113,12 +113,12 @@ static WRITE8_HANDLER( canyon_led_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x100) AM_RAM - AM_RANGE(0x0400, 0x0401) AM_DEVWRITE(SOUND, "discrete", canyon_motor_w) - AM_RANGE(0x0500, 0x0500) AM_DEVWRITE(SOUND, "discrete", canyon_explode_w) + AM_RANGE(0x0400, 0x0401) AM_DEVWRITE("discrete", canyon_motor_w) + AM_RANGE(0x0500, 0x0500) AM_DEVWRITE("discrete", canyon_explode_w) AM_RANGE(0x0501, 0x0501) AM_WRITE(watchdog_reset_w) /* watchdog, disabled in service mode */ - AM_RANGE(0x0600, 0x0603) AM_DEVWRITE(SOUND, "discrete", canyon_whistle_w) + AM_RANGE(0x0600, 0x0603) AM_DEVWRITE("discrete", canyon_whistle_w) AM_RANGE(0x0680, 0x0683) AM_WRITE(canyon_led_w) - AM_RANGE(0x0700, 0x0703) AM_DEVWRITE(SOUND, "discrete", canyon_attract_w) + AM_RANGE(0x0700, 0x0703) AM_DEVWRITE("discrete", canyon_attract_w) AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(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) diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 9a528a4e9c6..c9ce9f35d61 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -276,9 +276,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x2000, 0x2000) AM_WRITENOP /* Not hooked up according to the schematics */ - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index a5838034ae6..98ebae5b17d 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -107,7 +107,7 @@ static ADDRESS_MAP_START( mem_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x2007, 0x2007) AM_WRITE(lamps_w) AM_RANGE(0x2008, 0x2008) AM_NOP AM_RANGE(0x2080, 0x213f) AM_NOP - AM_RANGE(0x2400, 0x2400) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x2400, 0x2400) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x2800, 0x2801) AM_NOP AM_RANGE(0x2840, 0x2840) AM_NOP AM_RANGE(0x2880, 0x2880) AM_NOP diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index 645dc29ffec..76f09ef4393 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -97,10 +97,10 @@ static ADDRESS_MAP_START( carjmbre_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) //?? written on init/0xff sound command reset - AM_RANGE(0x20, 0x21) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0x20, 0x21) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) //?? written before and after 0x21 with same value AM_RANGE(0x24, 0x24) AM_READ(SMH_NOP) //?? - AM_RANGE(0x30, 0x31) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x30, 0x31) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0x32, 0x32) AM_WRITE(SMH_NOP) //?? written before and after 0x31 with same value ADDRESS_MAP_END diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index e3936846cb0..203f7dbe963 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -59,8 +59,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0xe800, 0xe800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe801, 0xe801) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&carrera_tileram) ADDRESS_MAP_END @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_READ_PORT("IN4") AM_RANGE(0x05, 0x05) AM_READ_PORT("IN5") AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) // ? - AM_RANGE(0x08, 0x09) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END static INPUT_PORTS_START( carrera ) diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index 937595feb0f..ed203d4fdc6 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -102,8 +102,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02,0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x10,0x10) AM_READ_PORT("IN0") AM_RANGE(0x11,0x11) AM_READ_PORT("IN1") AM_RANGE(0x10,0x10) AM_WRITE(scroll_w) diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 4c086d843bf..d2f89d7e73e 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -465,7 +465,7 @@ static NVRAM_HANDLER( korokoro ) static ADDRESS_MAP_START( dfeveron_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVREAD8("ymz", ymz280b_r, 0x00ff) // YMZ280 /**/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 @@ -482,7 +482,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dfeveron_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // YMZ280 AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM) AM_BASE(&cave_spriteram16_2) AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 @@ -503,7 +503,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ddonpach_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVREAD8("ymz", ymz280b_r, 0x00ff) // YMZ280 /**/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 @@ -521,7 +521,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ddonpach_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // YMZ280 AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM) AM_BASE(&cave_spriteram16_2 ) AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 @@ -578,8 +578,8 @@ static ADDRESS_MAP_START( donpachi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/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(SMH_RAM ) // Palette - AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) // M6295 - AM_RANGE(0xb00010, 0xb00011) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) // + AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) // M6295 + AM_RANGE(0xb00010, 0xb00011) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) // AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0" ) // Inputs AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1" ) // Inputs + EEPROM ADDRESS_MAP_END @@ -597,8 +597,8 @@ static ADDRESS_MAP_START( donpachi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) // M6295 - AM_RANGE(0xb00010, 0xb00013) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) // + AM_RANGE(0xb00000, 0xb00003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) // M6295 + AM_RANGE(0xb00010, 0xb00013) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) // AM_RANGE(0xb00020, 0xb0002f) AM_WRITE(NMK112_okibank_lsb_w ) // AM_RANGE(0xd00000, 0xd00001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM ADDRESS_MAP_END @@ -611,7 +611,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( esprade_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVREAD8("ymz", ymz280b_r, 0x00ff) // YMZ280 /**/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 @@ -629,7 +629,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( esprade_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // YMZ280 AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM) AM_BASE(&cave_spriteram16_2) // Sprites? AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 @@ -651,7 +651,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gaia_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVREAD8("ymz", ymz280b_r, 0x00ff) // YMZ280 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 @@ -673,7 +673,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gaia_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff ) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff ) // YMZ280 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) AM_BASE(&cave_spriteram16_2 ) // Sprite bank 2 AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 @@ -705,7 +705,7 @@ static ADDRESS_MAP_START( guwange_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/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, 0x800003) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0x00ff) // YMZ280 + AM_RANGE(0x800000, 0x800003) AM_DEVREAD8("ymz", ymz280b_r, 0x00ff) // YMZ280 /**/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 @@ -723,7 +723,7 @@ static ADDRESS_MAP_START( guwange_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff ) // YMZ280 + AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff ) // YMZ280 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 @@ -849,7 +849,7 @@ static ADDRESS_MAP_START( korokoro_readmem, ADDRESS_SPACE_PROGRAM, 16 ) // 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( SMH_RAM ) // Palette -// AM_RANGE(0x240000, 0x240003) AM_DEVREAD8( SOUND, "ymz", ymz280b_r, 0x00ff ) // YMZ280 +// AM_RANGE(0x240000, 0x240003) AM_DEVREAD8( "ymz", ymz280b_r, 0x00ff ) // YMZ280 AM_RANGE(0x280000, 0x280001) AM_READ_PORT("IN0" ) // Inputs + ??? AM_RANGE(0x280002, 0x280003) AM_READ_PORT("IN1" ) // Inputs + EEPROM AM_RANGE(0x300000, 0x30ffff) AM_READ( SMH_RAM ) // RAM @@ -862,7 +862,7 @@ static ADDRESS_MAP_START( korokoro_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8( SOUND, "ymz", ymz280b_w, 0x00ff) // YMZ280 + AM_RANGE(0x240000, 0x240003) AM_DEVWRITE8( "ymz", ymz280b_w, 0x00ff) // 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( SMH_NOP ) // 0 (watchdog?) @@ -1116,7 +1116,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( uopoko_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVREAD8("ymz", ymz280b_r, 0x00ff) // YMZ280 /**/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 @@ -1130,7 +1130,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( uopoko_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // YMZ280 + AM_RANGE(0x300000, 0x300003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // YMZ280 AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM) AM_BASE(&cave_spriteram16_2 ) AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 @@ -1188,15 +1188,15 @@ static ADDRESS_MAP_START( hotdogst_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r ) // From Main CPU AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r ) // - AM_RANGE(0x50, 0x51) AM_DEVREAD(SOUND, "ym", ym2203_r ) // - AM_RANGE(0x60, 0x60) AM_DEVREAD(SOUND, "oki", okim6295_r) // M6295 + AM_RANGE(0x50, 0x51) AM_DEVREAD("ym", ym2203_r ) // + AM_RANGE(0x60, 0x60) AM_DEVREAD("oki", okim6295_r) // M6295 ADDRESS_MAP_END static ADDRESS_MAP_START( hotdogst_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(hotdogst_rombank_w ) // ROM bank - AM_RANGE(0x50, 0x51) AM_DEVWRITE(SOUND, "ym", ym2203_w ) // - AM_RANGE(0x60, 0x60) AM_DEVWRITE(SOUND, "oki", okim6295_w) // M6295 + AM_RANGE(0x50, 0x51) AM_DEVWRITE("ym", ym2203_w ) // + AM_RANGE(0x60, 0x60) AM_DEVWRITE("oki", okim6295_w) // M6295 AM_RANGE(0x70, 0x70) AM_WRITE(hotdogst_okibank_w ) // Samples bank ADDRESS_MAP_END @@ -1231,15 +1231,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mazinger_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r ) // From Main CPU - AM_RANGE(0x52, 0x53) AM_DEVREAD(SOUND, "ym", ym2203_r ) // YM2203 + AM_RANGE(0x52, 0x53) AM_DEVREAD("ym", ym2203_r ) // YM2203 ADDRESS_MAP_END static ADDRESS_MAP_START( mazinger_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(mazinger_rombank_w ) // ROM bank AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w ) // To Main CPU - AM_RANGE(0x50, 0x51) AM_DEVWRITE(SOUND, "ym", ym2203_w ) // YM2203 - AM_RANGE(0x70, 0x70) AM_DEVWRITE(SOUND, "oki", okim6295_w) // M6295 + AM_RANGE(0x50, 0x51) AM_DEVWRITE("ym", ym2203_w ) // YM2203 + AM_RANGE(0x70, 0x70) AM_DEVWRITE("oki", okim6295_w) // M6295 AM_RANGE(0x74, 0x74) AM_WRITE(hotdogst_okibank_w ) // Samples bank ADDRESS_MAP_END @@ -1292,16 +1292,16 @@ static ADDRESS_MAP_START( metmqstr_sound_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ(soundflags_r ) // Communication AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r ) // From Main CPU AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r ) // - AM_RANGE(0x50, 0x51) AM_DEVREAD(SOUND, "ym", ym2151_r ) // YM2151 + AM_RANGE(0x50, 0x51) AM_DEVREAD("ym", ym2151_r ) // YM2151 ADDRESS_MAP_END static ADDRESS_MAP_START( metmqstr_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(metmqstr_rombank_w ) // Rom Bank - AM_RANGE(0x50, 0x51) AM_DEVWRITE(SOUND, "ym", ym2151_w ) // YM2151 - AM_RANGE(0x60, 0x60) AM_DEVWRITE(SOUND, "oki1", okim6295_w) // M6295 #0 + AM_RANGE(0x50, 0x51) AM_DEVWRITE("ym", ym2151_w ) // YM2151 + AM_RANGE(0x60, 0x60) AM_DEVWRITE("oki1", okim6295_w) // M6295 #0 AM_RANGE(0x70, 0x70) AM_WRITE(metmqstr_okibank0_w ) // Samples Bank #0 - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "oki2", okim6295_w) // M6295 #1 + AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki2", okim6295_w) // M6295 #1 AM_RANGE(0x90, 0x90) AM_WRITE(metmqstr_okibank1_w ) // Samples Bank #1 ADDRESS_MAP_END @@ -1333,19 +1333,19 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pwrinst2_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD(SOUND, "oki1", okim6295_r ) // M6295 - AM_RANGE(0x08, 0x08) AM_DEVREAD(SOUND, "oki2", okim6295_r ) // - AM_RANGE(0x40, 0x41) AM_DEVREAD(SOUND, "ym", ym2203_r ) // + AM_RANGE(0x00, 0x00) AM_DEVREAD("oki1", okim6295_r ) // M6295 + AM_RANGE(0x08, 0x08) AM_DEVREAD("oki2", okim6295_r ) // + AM_RANGE(0x40, 0x41) AM_DEVREAD("ym", ym2203_r ) // AM_RANGE(0x60, 0x60) AM_READ(soundlatch_hi_r ) // From Main CPU AM_RANGE(0x70, 0x70) AM_READ(soundlatch_lo_r ) // ADDRESS_MAP_END static ADDRESS_MAP_START( pwrinst2_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "oki1", okim6295_w ) // M6295 - AM_RANGE(0x08, 0x08) AM_DEVWRITE(SOUND, "oki2", okim6295_w ) // + AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki1", okim6295_w ) // M6295 + AM_RANGE(0x08, 0x08) AM_DEVWRITE("oki2", okim6295_w ) // AM_RANGE(0x10, 0x17) AM_WRITE(NMK112_okibank_w ) // Samples bank - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ym", ym2203_w ) // + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym", ym2203_w ) // AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch_ack_w ) // To Main CPU // AM_RANGE(0x51, 0x51) AM_WRITE(SMH_NOP ) // ?? volume AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w ) // ROM bank @@ -1412,19 +1412,19 @@ static ADDRESS_MAP_START( sailormn_sound_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ(soundflags_r ) // Communication AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r ) // From Main CPU AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r ) // - AM_RANGE(0x50, 0x51) AM_DEVREAD(SOUND, "ym", ym2151_r ) // YM2151 - AM_RANGE(0x60, 0x60) AM_DEVREAD(SOUND, "oki1", okim6295_r ) // M6295 #0 - AM_RANGE(0x80, 0x80) AM_DEVREAD(SOUND, "oki2", okim6295_r ) // M6295 #1 + AM_RANGE(0x50, 0x51) AM_DEVREAD("ym", ym2151_r ) // YM2151 + AM_RANGE(0x60, 0x60) AM_DEVREAD("oki1", okim6295_r ) // M6295 #0 + AM_RANGE(0x80, 0x80) AM_DEVREAD("oki2", okim6295_r ) // M6295 #1 ADDRESS_MAP_END static ADDRESS_MAP_START( sailormn_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sailormn_rombank_w ) // Rom Bank AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w ) // To Main CPU - AM_RANGE(0x50, 0x51) AM_DEVWRITE(SOUND, "ym", ym2151_w ) // YM2151 - AM_RANGE(0x60, 0x60) AM_DEVWRITE(SOUND, "oki1", okim6295_w ) // M6295 #0 + AM_RANGE(0x50, 0x51) AM_DEVWRITE("ym", ym2151_w ) // YM2151 + AM_RANGE(0x60, 0x60) AM_DEVWRITE("oki1", okim6295_w ) // M6295 #0 AM_RANGE(0x70, 0x70) AM_WRITE(sailormn_okibank0_w ) // Samples Bank #0 - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "oki2", okim6295_w ) // M6295 #1 + AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki2", okim6295_w ) // M6295 #1 AM_RANGE(0xc0, 0xc0) AM_WRITE(sailormn_okibank1_w ) // Samples Bank #1 ADDRESS_MAP_END diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 9229782eef9..47a6c8b0bd0 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -145,8 +145,8 @@ static ADDRESS_MAP_START( cbasebal_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(eeprom_cs_w) AM_RANGE(0x02, 0x02) AM_WRITE(eeprom_clock_w) AM_RANGE(0x03, 0x03) AM_WRITE(eeprom_serial_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x08, 0x09) AM_WRITE(cbasebal_scrollx_w) AM_RANGE(0x0a, 0x0b) AM_WRITE(cbasebal_scrolly_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("P1") diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 665348b6af0..d90128072bc 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -159,20 +159,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym2", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x100000, 0x100001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym2", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym2", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x100000, 0x100001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym2", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 1681f769dca..c898fd88fe5 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -350,8 +350,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0300) AM_RAM AM_BASE(&nvram_stage) AM_SIZE(&generic_nvram_size) AM_RANGE(0x9400, 0x9403) AM_MIRROR(0x01fc) AM_READ(leta_r) AM_RANGE(0x9600, 0x97ff) AM_READ_PORT("IN0") - AM_RANGE(0x9800, 0x980f) AM_MIRROR(0x01f0) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x9a00, 0x9a0f) AM_MIRROR(0x01f0) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x9800, 0x980f) AM_MIRROR(0x01f0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x9a00, 0x9a0f) AM_MIRROR(0x01f0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x9c00, 0x9c7f) AM_WRITE(nvram_recall_w) AM_RANGE(0x9c80, 0x9cff) AM_WRITE(ccastles_hscroll_w) AM_RANGE(0x9d00, 0x9d7f) AM_WRITE(ccastles_vscroll_w) diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c index 61455cb82cd..7cde886dcee 100644 --- a/src/mame/drivers/cchance.c +++ b/src/mame/drivers/cchance.c @@ -74,8 +74,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf000) AM_READNOP AM_WRITENOP //??? AM_RANGE(0xf001, 0xf001) AM_READ(input_1_r) AM_WRITE(output_0_w) AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN0") AM_WRITE(output_1_w) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xf801, 0xf801) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xf801, 0xf801) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c index 6c2a9cc18d5..06e9a134cd4 100644 --- a/src/mame/drivers/cchasm.c +++ b/src/mame/drivers/cchasm.c @@ -51,19 +51,19 @@ static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM AM_RANGE(0x5000, 0x53ff) AM_RAM - AM_RANGE(0x6000, 0x6001) AM_MIRROR(0xf9e) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_MIRROR(0xf9e) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0xf9e) AM_READ(cchasm_coin_sound_r) - AM_RANGE(0x6001, 0x6001) AM_MIRROR(0xf9e) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x6020, 0x6021) AM_MIRROR(0xf9e) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x6021, 0x6021) AM_MIRROR(0xf9e) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x6001, 0x6001) AM_MIRROR(0xf9e) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x6020, 0x6021) AM_MIRROR(0xf9e) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x6021, 0x6021) AM_MIRROR(0xf9e) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0x6040, 0x6040) AM_MIRROR(0xf9e) AM_READWRITE(soundlatch_r, soundlatch3_w) AM_RANGE(0x6041, 0x6041) AM_MIRROR(0xf9e) AM_READWRITE(cchasm_soundlatch2_r, cchasm_soundlatch4_w) - AM_RANGE(0x6061, 0x6061) AM_MIRROR(0xf9e) AM_DEVWRITE(Z80CTC, "ctc", z80ctc_trg0_w) + AM_RANGE(0x6061, 0x6061) AM_MIRROR(0xf9e) AM_DEVWRITE("ctc", z80ctc_trg0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END static void cchasm_6840_irq(running_machine *machine, int state) @@ -145,7 +145,7 @@ static MACHINE_START( cchasm ) static const z80_daisy_chain daisy_chain[] = { - { Z80CTC, "ctc" }, + { "ctc" }, { NULL } }; diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index f3a15f06ffd..1c055b78a54 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -381,8 +381,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cclimber_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x09) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END static ADDRESS_MAP_START( yamato_portmap, ADDRESS_SPACE_IO, 8 ) @@ -407,14 +407,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( swimmer_audio_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay2", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( yamato_audio_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0x04, 0x04) AM_READ(yamato_p0_r) /* ??? */ AM_RANGE(0x08, 0x08) AM_READ(yamato_p1_r) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 2bfda256bd1..6c214504c8a 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -682,11 +682,11 @@ static ADDRESS_MAP_START( centiped_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x0c02, 0x0c02) AM_READ(centiped_IN2_r) /* IN2 */ AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("IN3") /* IN3 */ - AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) + AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) AM_RANGE(0x1400, 0x140f) AM_WRITE(centiped_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x1600, 0x163f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x1680, 0x1680) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x1700, 0x173f) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x1600, 0x163f) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x1680, 0x1680) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x1700, 0x173f) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x1800, 0x1800) AM_WRITE(irq_ack_w) AM_RANGE(0x1c00, 0x1c02) AM_WRITE(coin_count_w) AM_RANGE(0x1c03, 0x1c04) AM_WRITE(led_w) @@ -707,12 +707,12 @@ static ADDRESS_MAP_START( centipdb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x4000) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x0c02, 0x0c02) AM_MIRROR(0x4000) AM_READ(centiped_IN2_r) /* IN2 */ AM_RANGE(0x0c03, 0x0c03) AM_MIRROR(0x4000) AM_READ_PORT("IN3") /* IN3 */ - AM_RANGE(0x1000, 0x1001) AM_MIRROR(0x4000) AM_DEVWRITE(SOUND, "pokey", ay8910_data_address_w) - AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x4000) AM_DEVREAD(SOUND, "pokey", ay8910_r) + AM_RANGE(0x1000, 0x1001) AM_MIRROR(0x4000) AM_DEVWRITE("pokey", ay8910_data_address_w) + AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x4000) AM_DEVREAD("pokey", ay8910_r) AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x4000) AM_WRITE(centiped_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x1600, 0x163f) AM_MIRROR(0x4000) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x4000) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x1700, 0x173f) AM_MIRROR(0x4000) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x1600, 0x163f) AM_MIRROR(0x4000) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x4000) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x1700, 0x173f) AM_MIRROR(0x4000) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x4000) AM_WRITE(irq_ack_w) AM_RANGE(0x1c00, 0x1c02) AM_MIRROR(0x4000) AM_WRITE(coin_count_w) AM_RANGE(0x1c03, 0x1c04) AM_MIRROR(0x4000) AM_WRITE(led_w) @@ -733,15 +733,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( milliped_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) - AM_RANGE(0x0800, 0x080f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) + AM_RANGE(0x0800, 0x080f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(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) AM_RANGE(0x2010, 0x2010) AM_READ(milliped_IN2_r) AM_RANGE(0x2011, 0x2011) AM_READ_PORT("IN3") - AM_RANGE(0x2030, 0x2030) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x2030, 0x2030) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x2480, 0x249f) AM_WRITE(milliped_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x2500, 0x2502) AM_WRITE(coin_count_w) AM_RANGE(0x2503, 0x2504) AM_WRITE(led_w) @@ -750,8 +750,8 @@ static ADDRESS_MAP_START( milliped_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2507, 0x2507) AM_WRITE(control_select_w) /* CNTRLSEL */ AM_RANGE(0x2600, 0x2600) AM_WRITE(irq_ack_w) AM_RANGE(0x2680, 0x2680) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x2700, 0x2700) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x2780, 0x27bf) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) + AM_RANGE(0x2700, 0x2700) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x2780, 0x27bf) AM_DEVWRITE("earom", atari_vg_earom_w) AM_RANGE(0x4000, 0x7fff) AM_ROM ADDRESS_MAP_END @@ -772,7 +772,7 @@ static ADDRESS_MAP_START( warlords_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0801, 0x0801) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("IN1") /* IN1 */ - AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) + AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(irq_ack_w) AM_RANGE(0x1c00, 0x1c02) AM_WRITE(coin_count_w) AM_RANGE(0x1c03, 0x1c06) AM_WRITE(led_w) @@ -791,8 +791,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) - AM_RANGE(0x0800, 0x080f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) + AM_RANGE(0x0800, 0x080f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE(&videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x2000, 0x2000) AM_READ_PORT("IN0") @@ -800,7 +800,7 @@ static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2010, 0x2010) AM_READ_PORT("IN2") AM_RANGE(0x2011, 0x2011) AM_READ_PORT("IN3") AM_RANGE(0x2020, 0x2020) AM_READ(mazeinv_input_r) - AM_RANGE(0x2030, 0x2030) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x2030, 0x2030) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x2480, 0x249f) AM_WRITE(mazeinv_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x2500, 0x2502) AM_WRITE(coin_count_w) AM_RANGE(0x2503, 0x2504) AM_WRITE(led_w) @@ -809,8 +809,8 @@ static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x2700, 0x2700) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x2780, 0x27bf) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) + AM_RANGE(0x2700, 0x2700) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x2780, 0x27bf) AM_DEVWRITE("earom", atari_vg_earom_w) AM_RANGE(0x3000, 0x7fff) AM_ROM ADDRESS_MAP_END @@ -828,8 +828,8 @@ static ADDRESS_MAP_START( bullsdrt_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x6000) AM_READ(centiped_IN0_r) AM_RANGE(0x1081, 0x1081) AM_MIRROR(0x6000) AM_READ_PORT("IN1") AM_RANGE(0x1082, 0x1082) AM_MIRROR(0x6000) AM_READ(centiped_IN2_r) - AM_RANGE(0x1200, 0x123f) AM_MIRROR(0x6000) AM_DEVREADWRITE(ATARIVGEAROM, "earom", atari_vg_earom_r, atari_vg_earom_w) - AM_RANGE(0x1280, 0x1280) AM_MIRROR(0x6000) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x1200, 0x123f) AM_MIRROR(0x6000) AM_DEVREADWRITE("earom", atari_vg_earom_r, atari_vg_earom_w) + AM_RANGE(0x1280, 0x1280) AM_MIRROR(0x6000) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) AM_RANGE(0x1300, 0x1300) AM_MIRROR(0x6000) AM_READ_PORT("DSW2") AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x6000) AM_WRITE(centiped_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x1481, 0x1481) AM_MIRROR(0x6000) AM_WRITE(bullsdrt_coin_count_w) @@ -848,7 +848,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bullsdrt_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(bullsdrt_sprites_bank_w) AM_RANGE(0x20, 0x3f) AM_WRITE(bullsdrt_tilesbank_w) AM_BASE(&bullsdrt_tiles_bankram) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE("sn", sn76496_w) ADDRESS_MAP_END @@ -1977,7 +1977,7 @@ ROM_END static DRIVER_INIT( caterplr ) { const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); - const device_config *device = devtag_get_device(machine, SOUND, "pokey"); + const device_config *device = devtag_get_device(machine, "pokey"); memory_install_readwrite8_device_handler(space, device, 0x1000, 0x100f, 0, 0, caterplr_AY8910_r, caterplr_AY8910_w); memory_install_read8_device_handler(space, device, 0x1780, 0x1780, 0, 0, caterplr_rand_r); } @@ -1986,7 +1986,7 @@ static DRIVER_INIT( caterplr ) static DRIVER_INIT( magworm ) { const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); - const device_config *device = devtag_get_device(machine, SOUND, "pokey"); + const device_config *device = devtag_get_device(machine, "pokey"); memory_install_write8_device_handler(space, device, 0x1001, 0x1001, 0, 0, ay8910_address_w); memory_install_readwrite8_device_handler(space, device, 0x1003, 0x1003, 0, 0, ay8910_r, ay8910_data_w); } diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index e5be482622c..da26f592bc0 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -45,8 +45,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x8805, 0x8805) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8807, 0x8807) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x8805, 0x8805) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8807, 0x8807) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0x8808, 0x8808) AM_READ_PORT("DSWC") AM_RANGE(0x8809, 0x8809) AM_READ_PORT("P1") AM_RANGE(0x880a, 0x880a) AM_READ_PORT("SYSTEM") @@ -65,8 +65,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x8804, 0x8805) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8806, 0x8807) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x8804, 0x8805) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8806, 0x8807) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0x880c, 0x880c) AM_WRITE(chaknpop_gfxmode_w) AM_RANGE(0x880D, 0x880D) AM_WRITE(coinlock_w) // coin lock out AM_RANGE(0x9000, 0x93ff) AM_WRITE(chaknpop_txram_w) AM_BASE(&chaknpop_txram) diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index 4afafa313f9..fb0dd9c9b5b 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -159,11 +159,11 @@ static WRITE8_HANDLER( cham24_mapper_w ) static ADDRESS_MAP_START( cham24_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE(SOUND, "nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w) - AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE(SOUND, "nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE("nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ AM_RANGE(0x4016, 0x4016) AM_READWRITE(cham24_IN0_r, cham24_IN0_w) /* IN0 - input port 1 */ - AM_RANGE(0x4017, 0x4017) AM_READ(cham24_IN1_r) AM_DEVWRITE(SOUND, "nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4017, 0x4017) AM_READ(cham24_IN1_r) AM_DEVWRITE("nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x8000, 0xffff) AM_ROM AM_WRITE(cham24_mapper_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 52a817200fb..18e72478743 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -213,7 +213,7 @@ AB 1010_1011 static ADDRESS_MAP_START( talbot_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) /* MCU shared RAM */ - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram) AM_RANGE(0x8800, 0x8fef) AM_RAM AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) @@ -240,7 +240,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram) AM_RANGE(0x8800, 0x8fef) AM_RAM @@ -272,7 +272,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( exctsccb_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) // MCU not used (though it's present on the board) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_data_address_w) // AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram) AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(&spriteram_2) /* ??? */ @@ -326,7 +326,7 @@ static ADDRESS_MAP_START( champbas_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x7fff) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x9fff) AM_WRITENOP // 4-bit return code to main CPU (not used) AM_RANGE(0xa000, 0xbfff) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE(SOUND, "dac", champbas_dac_w) + AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE("dac", champbas_dac_w) AM_RANGE(0xe000, 0xe3ff) AM_MIRROR(0x1c00) AM_RAM ADDRESS_MAP_END @@ -334,8 +334,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( exctsccr_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x8fff) AM_ROM AM_RANGE(0xa000, 0xa7ff) AM_RAM - AM_RANGE(0xc008, 0xc008) AM_DEVWRITE(SOUND, "dac1", champbas_dac_w) - AM_RANGE(0xc009, 0xc009) AM_DEVWRITE(SOUND, "dac2", champbas_dac_w) + AM_RANGE(0xc008, 0xc008) AM_DEVWRITE("dac1", champbas_dac_w) + AM_RANGE(0xc009, 0xc009) AM_DEVWRITE("dac2", champbas_dac_w) AM_RANGE(0xc00c, 0xc00c) AM_WRITE(soundlatch_clear_w) AM_RANGE(0xc00d, 0xc00d) AM_READ(soundlatch_r) // AM_RANGE(0xc00f, 0xc00f) AM_WRITENOP /* ??? */ @@ -343,10 +343,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( exctsccr_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK( 0x00ff ) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x86, 0x87) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x8a, 0x8b) AM_DEVWRITE(SOUND, "ay3", ay8910_data_address_w) - AM_RANGE(0x8e, 0x8f) AM_DEVWRITE(SOUND, "ay4", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x86, 0x87) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x8a, 0x8b) AM_DEVWRITE("ay3", ay8910_data_address_w) + AM_RANGE(0x8e, 0x8f) AM_DEVWRITE("ay4", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 22cc131369c..4ce2349d0d2 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&tnzs_objram) - AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE(SOUND, "x1", seta_sound_r, seta_sound_w) + AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("x1", seta_sound_r, seta_sound_w) 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) */ diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index e5eb21156dc..cc38d8500d4 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -183,7 +183,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW0") AM_RANGE(0x2001, 0x2001) AM_READ_PORT("SYSTEM") AM_RANGE(0x2003, 0x2003) AM_READ_PORT("JOY") - AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 5ff392ae912..8eba9d9507d 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -258,8 +258,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_READ(changela_mem_device_r) /* RAM4 (River Bed RAM); RAM5 (Tree RAM) */ - AM_RANGE(0xd000, 0xd000) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xd010, 0xd010) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0xd000, 0xd000) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xd010, 0xd010) AM_DEVREAD("ay2", ay8910_r) /* LS139 - U24 */ AM_RANGE(0xd024, 0xd024) AM_READ(changela_24_r) @@ -290,8 +290,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xca00, 0xca00) AM_WRITE(changela_slope_rom_addr_hi_w) AM_RANGE(0xcb00, 0xcb00) AM_WRITE(changela_slope_rom_addr_lo_w) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xd010, 0xd011) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xd010, 0xd011) AM_DEVWRITE("ay2", ay8910_address_data_w) /* LS259 - U44 */ AM_RANGE(0xd020, 0xd020) AM_WRITE(changela_collision_reset_0) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 51cdd163a31..83aed55a709 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -365,8 +365,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -376,22 +376,22 @@ static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) // 8804 and/or 8805 make a gong sound when the coin goes in // but only on the title screen.... - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) -// AM_RANGE(0x8802, 0x8802) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) -// AM_RANGE(0x8803, 0x8803) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x8804, 0x8805) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) +// AM_RANGE(0x8802, 0x8802) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) +// AM_RANGE(0x8803, 0x8803) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x8804, 0x8805) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) // AM_RANGE(0x8804, 0x8804) AM_WRITE(SMH_RAM) // AM_RANGE(0x8805, 0x8805) AM_WRITE(SMH_RAM) -// AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) -// AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) +// AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) +// AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( saiyugb1_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(saiyugb1_mcu_command_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -403,10 +403,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( i8748_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(saiyugb1_mcu_command_r) - AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_DEVWRITE(SOUND, "adpcm", saiyugb1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */ + AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_DEVWRITE("adpcm", saiyugb1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */ AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(saiyugb1_m5205_irq_r) AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(saiyugb1_adpcm_rom_addr_w) - AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE(SOUND, "adpcm", saiyugb1_adpcm_control_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE("adpcm", saiyugb1_adpcm_control_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index cb287d99ed9..f46cab96f8f 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -198,7 +198,7 @@ static ADDRESS_MAP_START( chinsan_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(chinsan_port00_w) AM_RANGE(0x01, 0x01) AM_READ(chinsan_input_port_0_r) AM_RANGE(0x02, 0x02) AM_READ(chinsan_input_port_1_r) - AM_RANGE(0x10, 0x11) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x30, 0x30) AM_WRITE(ctrl_w) // ROM bank + unknown stuff (input mutliplex?) ADDRESS_MAP_END diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index a62e0e3fd28..f1829650563 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -188,9 +188,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chqflag_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ - AM_RANGE(0xa000, 0xa00d) AM_DEVREAD(SOUND, "konami1", k007232_r) /* 007232 (chip 1) */ - AM_RANGE(0xb000, 0xb00d) AM_DEVREAD(SOUND, "konami2", k007232_r) /* 007232 (chip 2) */ - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM2151 */ + AM_RANGE(0xa000, 0xa00d) AM_DEVREAD("konami1", k007232_r) /* 007232 (chip 1) */ + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami2", k007232_r) /* 007232 (chip 2) */ + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) /* YM2151 */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r */ //AM_RANGE(0xe000, 0xe000) AM_READ(SMH_NOP) /* ??? */ ADDRESS_MAP_END @@ -202,23 +202,23 @@ static WRITE8_HANDLER( k007232_bankswitch_w ) /* banks # for the 007232 (chip 1) */ bank_A = ((data >> 4) & 0x03); bank_B = ((data >> 6) & 0x03); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami1"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami1"), bank_A, bank_B ); /* banks # for the 007232 (chip 2) */ bank_A = ((data >> 0) & 0x03); bank_B = ((data >> 2) & 0x03); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami2"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami2"), bank_A, bank_B ); } static ADDRESS_MAP_START( chqflag_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "konami1", k007232_w) /* 007232 (chip 1) */ - AM_RANGE(0xa01c, 0xa01c) AM_DEVWRITE(SOUND, "konami2", k007232_extvolume_w)/* extra volume, goes to the 007232 w/ A11 */ + AM_RANGE(0xa000, 0xa00d) AM_DEVWRITE("konami1", k007232_w) /* 007232 (chip 1) */ + AM_RANGE(0xa01c, 0xa01c) AM_DEVWRITE("konami2", k007232_extvolume_w)/* extra volume, goes to the 007232 w/ A11 */ /* selecting a different latch for the external port */ - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami2", k007232_w) /* 007232 (chip 2) */ - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM2151 */ + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami2", k007232_w) /* 007232 (chip 2) */ + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) /* YM2151 */ AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index b3eb7240bf8..ccd35014c78 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -232,25 +232,25 @@ static COP400_INTERFACE( draco_cop_intf ) static ADDRESS_MAP_START( destryer_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(0xf400, 0xf7ff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) - AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) + AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) + AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( destryea_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) - AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) + AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) + AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( destryer_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITE(destryer_out1_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out3_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out4_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out5_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out6_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out7_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(CDP1869_TAG, cdp1869_out3_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE(CDP1869_TAG, cdp1869_out4_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(CDP1869_TAG, cdp1869_out5_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(CDP1869_TAG, cdp1869_out6_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE(CDP1869_TAG, cdp1869_out7_w) ADDRESS_MAP_END // Altair @@ -258,18 +258,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( altair_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x3000, 0x30ff) AM_RAM - AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) - AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) + AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) + AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( altair_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x01, 0x01) AM_DEVREAD(CDP1852, "ic23", cdp1852_data_r) AM_DEVWRITE(CDP1852, "ic26", cdp1852_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(CDP1852, "ic24", cdp1852_data_r) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out3_w) - AM_RANGE(0x04, 0x04) AM_DEVREAD(CDP1852, "ic25", cdp1852_data_r) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out4_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out5_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out6_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out7_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ic23", cdp1852_data_r) AM_DEVWRITE("ic26", cdp1852_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ic24", cdp1852_data_r) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(CDP1869_TAG, cdp1869_out3_w) + AM_RANGE(0x04, 0x04) AM_DEVREAD("ic25", cdp1852_data_r) AM_DEVWRITE(CDP1869_TAG, cdp1869_out4_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(CDP1869_TAG, cdp1869_out5_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(CDP1869_TAG, cdp1869_out6_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE(CDP1869_TAG, cdp1869_out7_w) ADDRESS_MAP_END // Draco @@ -277,18 +277,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( draco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) - AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(SOUND, CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) + AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_charram_r, cdp1869_charram_w) + AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_pageram_r, cdp1869_pageram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( draco_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x01, 0x01) AM_DEVREAD(CDP1852, "ic29", cdp1852_data_r) AM_DEVWRITE(CDP1852, "ic32", cdp1852_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(CDP1852, "ic30", cdp1852_data_r) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out3_w) - AM_RANGE(0x04, 0x04) AM_DEVREAD(CDP1852, "ic31", cdp1852_data_r) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out4_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out5_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out6_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, CDP1869_TAG, cdp1869_out7_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ic29", cdp1852_data_r) AM_DEVWRITE("ic32", cdp1852_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ic30", cdp1852_data_r) + AM_RANGE(0x03, 0x03) AM_DEVWRITE(CDP1869_TAG, cdp1869_out3_w) + AM_RANGE(0x04, 0x04) AM_DEVREAD("ic31", cdp1852_data_r) AM_DEVWRITE(CDP1869_TAG, cdp1869_out4_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE(CDP1869_TAG, cdp1869_out5_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE(CDP1869_TAG, cdp1869_out6_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE(CDP1869_TAG, cdp1869_out7_w) ADDRESS_MAP_END static ADDRESS_MAP_START( draco_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -297,7 +297,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( draco_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(COP400_PORT_D, COP400_PORT_D) AM_WRITE(draco_sound_bankswitch_w) - AM_RANGE(COP400_PORT_G, COP400_PORT_G) AM_DEVWRITE(SOUND, AY8910_TAG, draco_sound_g_w) + AM_RANGE(COP400_PORT_G, COP400_PORT_G) AM_DEVWRITE(AY8910_TAG, draco_sound_g_w) AM_RANGE(COP400_PORT_L, COP400_PORT_L) AM_READWRITE(draco_sound_ay8910_r, draco_sound_ay8910_w) AM_RANGE(COP400_PORT_IN, COP400_PORT_IN) AM_READ(draco_sound_in_r) AM_RANGE(COP400_PORT_SIO, COP400_PORT_SIO) AM_NOP diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index ee35a56dbab..7abf9043fd5 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -126,25 +126,25 @@ static WRITE8_HANDLER(circusc_sound_w) /* CS3 */ case 1: - device = devtag_get_device(space->machine, SOUND, "sn1"); + device = devtag_get_device(space->machine, "sn1"); sn76496_w(device, 0, sn_latch); break; /* CS4 */ case 2: - device = devtag_get_device(space->machine, SOUND, "sn2"); + device = devtag_get_device(space->machine, "sn2"); sn76496_w(device, 0, sn_latch); break; /* CS5 */ case 3: - device = devtag_get_device(space->machine, SOUND, "fltdisc"); + device = devtag_get_device(space->machine, "fltdisc"); discrete_sound_w(device, NODE_03, data); break; /* CS6 */ case 4: - device = devtag_get_device(space->machine, SOUND, "fltdisc"); + device = devtag_get_device(space->machine, "fltdisc"); discrete_sound_w(device, NODE_05, (offset & 0x20) >> 5); discrete_sound_w(device, NODE_06, (offset & 0x18) >> 3); discrete_sound_w(device, NODE_07, (offset & 0x40) >> 6); diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index 66fb308396d..859f8729ae6 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -579,8 +579,8 @@ static WRITE16_HANDLER( scudhamm_oki_bank_w ) { if (ACCESSING_BITS_0_7) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), 0x40000 * ((data >> 0) & 0x3) ); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), 0x40000 * ((data >> 4) & 0x3) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), 0x40000 * ((data >> 0) & 0x3) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), 0x40000 * ((data >> 4) & 0x3) ); } } @@ -592,8 +592,8 @@ static ADDRESS_MAP_START( readmem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 ) 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_PORT("IN0") // Buttons - AM_RANGE(0x100014, 0x100015) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) // Sound - AM_RANGE(0x100018, 0x100019) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) // + AM_RANGE(0x100014, 0x100015) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0x100018, 0x100019) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) // AM_RANGE(0x100040, 0x100041) AM_READ(scudhamm_analog_r ) // A / D AM_RANGE(0x100044, 0x100045) AM_READ(scudhamm_motor_pos_r ) // Motor Position AM_RANGE(0x100050, 0x100051) AM_READ(scudhamm_motor_status_r ) // Motor Limit Switches @@ -609,8 +609,8 @@ static ADDRESS_MAP_START( writemem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 ) 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(scudhamm_leds_w ) // Leds - AM_RANGE(0x100014, 0x100015) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) // Sound - AM_RANGE(0x100018, 0x100019) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) // + AM_RANGE(0x100014, 0x100015) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) // Sound + AM_RANGE(0x100018, 0x100019) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) // AM_RANGE(0x10001c, 0x10001d) AM_WRITE(scudhamm_enable_w ) // ? AM_RANGE(0x100040, 0x100041) AM_WRITE(SMH_NOP ) // ? 0 written before reading AM_RANGE(0x100050, 0x100051) AM_WRITE(scudhamm_motor_command_w ) // Move Motor @@ -692,8 +692,8 @@ static ADDRESS_MAP_START( readmem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100008, 0x100009) AM_READ(armchmp2_buttons_r ) // Buttons + Sensors AM_RANGE(0x10000c, 0x10000d) AM_READ(armchmp2_analog_r ) // A / D AM_RANGE(0x100010, 0x100011) AM_READ(armchmp2_motor_status_r ) // Motor Limit Switches? - AM_RANGE(0x100014, 0x100015) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) // Sound - AM_RANGE(0x100018, 0x100019) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) // + AM_RANGE(0x100014, 0x100015) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0x100018, 0x100019) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) // ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 ) @@ -707,8 +707,8 @@ static ADDRESS_MAP_START( writemem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100008, 0x100009) AM_WRITE(armchmp2_leds_w ) // Leds + Coin Counters 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_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) // Sound - AM_RANGE(0x100018, 0x100019) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) // + AM_RANGE(0x100014, 0x100015) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) // Sound + AM_RANGE(0x100018, 0x100019) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) // ADDRESS_MAP_END @@ -843,8 +843,8 @@ static WRITE16_HANDLER( bigrun_soundbank_w ) { if (ACCESSING_BITS_0_7) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), 0x40000 * ((data >> 0) & 1) ); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), 0x40000 * ((data >> 4) & 1) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), 0x40000 * ((data >> 0) & 1) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), 0x40000 * ((data >> 4) & 1) ); } } @@ -852,9 +852,9 @@ static ADDRESS_MAP_START( bigrun_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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(0x080000, 0x080003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVREAD8("ym", ym2151_r, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) ADDRESS_MAP_END static ADDRESS_MAP_START( bigrun_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -862,9 +862,9 @@ static ADDRESS_MAP_START( bigrun_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x080003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) ADDRESS_MAP_END @@ -881,20 +881,20 @@ static ADDRESS_MAP_START( cischeat_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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(0x080000, 0x080003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVREAD8("ym", ym2151_r, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) ADDRESS_MAP_END static ADDRESS_MAP_START( cischeat_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x040002, 0x040003) AM_DEVWRITE(SOUND, "oki1", cischeat_soundbank_w ) // Sample Banking - AM_RANGE(0x040004, 0x040005) AM_DEVWRITE(SOUND, "oki2", cischeat_soundbank_w ) // Sample Banking + AM_RANGE(0x040002, 0x040003) AM_DEVWRITE("oki1", cischeat_soundbank_w ) // Sample Banking + AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki2", cischeat_soundbank_w ) // Sample Banking AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w ) // To Main CPU - AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) ADDRESS_MAP_END @@ -906,20 +906,20 @@ static ADDRESS_MAP_START( f1gpstar_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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(0x080000, 0x080003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVREAD8("ym", ym2151_r, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstar_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki1", cischeat_soundbank_w ) // Sample Banking (cischeat: 40002) - AM_RANGE(0x040008, 0x040009) AM_DEVWRITE(SOUND, "oki2", cischeat_soundbank_w ) // Sample Banking (cischeat: 40004) + AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki1", cischeat_soundbank_w ) // Sample Banking (cischeat: 40002) + AM_RANGE(0x040008, 0x040009) AM_DEVWRITE("oki2", cischeat_soundbank_w ) // Sample Banking (cischeat: 40004) AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w ) // To Main CPU (cischeat: 60002) - AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) ADDRESS_MAP_END @@ -931,21 +931,21 @@ static ADDRESS_MAP_START( f1gpstr2_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) + AM_RANGE(0x080002, 0x080003) AM_DEVREAD8("ym", ym2151_r, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstr2_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x040004, 0x040005) AM_DEVWRITE(SOUND, "oki1", cischeat_soundbank_w) // Sample Banking - AM_RANGE(0x040008, 0x040009) AM_DEVWRITE(SOUND, "oki2", cischeat_soundbank_w) // Sample Banking + AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki1", cischeat_soundbank_w) // Sample Banking + AM_RANGE(0x040008, 0x040009) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking 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, 0x080003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff ) - AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) + AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff ) + AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) ADDRESS_MAP_END /************************************************************************** diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index 18c4ce06316..684802aed2d 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -54,15 +54,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) -// AM_RANGE(0x4002, 0x4002) AM_DEVREAD(SOUND, "ay", ay8910_r) /* ?? */ - AM_RANGE(0x6000, 0x6001) AM_DEVREAD(SOUND, "ym", ym2203_r) +// AM_RANGE(0x4002, 0x4002) AM_DEVREAD("ay", ay8910_r) /* ?? */ + AM_RANGE(0x6000, 0x6001) AM_DEVREAD("ym", ym2203_r) 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(SMH_RAM) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ym", ym2203_w) 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 a9d3d25000e..e6422eda8aa 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -224,8 +224,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x20, 0x23) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index e4abdbce684..8e4cc1f8299 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -211,7 +211,7 @@ static void vdp_interrupt (running_machine *machine, int state) static MACHINE_START( cliffhgr ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); irq_timer = timer_alloc(machine, cliff_irq_callback, NULL); } @@ -234,7 +234,7 @@ static ADDRESS_MAP_START( mainport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x44, 0x44) AM_WRITE(TMS9928A_vram_w) AM_RANGE(0x45, 0x45) AM_READ(TMS9928A_vram_r) - AM_RANGE(0x46, 0x46) AM_DEVWRITE(SOUND, "discrete", cliff_sound_overlay_w) + AM_RANGE(0x46, 0x46) AM_DEVWRITE("discrete", cliff_sound_overlay_w) AM_RANGE(0x50, 0x52) AM_READ(cliff_phillips_code_r) AM_RANGE(0x53, 0x53) AM_READ(cliff_irq_ack_r) AM_RANGE(0x54, 0x54) AM_WRITE(TMS9928A_register_w) diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index a259e20bf1f..ccf46570c1e 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -169,8 +169,8 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(cloak_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) /* DSW0 also */ - AM_RANGE(0x1800, 0x180f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) /* DSW1 also */ + AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) /* DSW0 also */ + AM_RANGE(0x1800, 0x180f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) /* DSW1 also */ AM_RANGE(0x2000, 0x2000) AM_READ_PORT("P1") AM_RANGE(0x2200, 0x2200) AM_READ_PORT("P2") AM_RANGE(0x2400, 0x2400) AM_READ_PORT("SYSTEM") diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index cebc26716b9..28ec3eb51aa 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -316,8 +316,8 @@ static ADDRESS_MAP_START( cloud9_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x007e) AM_READ_PORT("IN0") AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x007e) AM_READ_PORT("IN1") AM_RANGE(0x5900, 0x5903) AM_MIRROR(0x007c) AM_READ(leta_r) - AM_RANGE(0x5a00, 0x5a0f) AM_MIRROR(0x00f0) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x5b00, 0x5b0f) AM_MIRROR(0x00f0) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x5a00, 0x5a0f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x5b00, 0x5b0f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) 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/cninja.c b/src/mame/drivers/cninja.c index 51568a051c3..115418bc325 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -329,20 +329,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym2", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x100000, 0x100001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym2", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym2", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x100000, 0x100001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym2", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) @@ -351,9 +351,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END @@ -361,9 +361,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) @@ -372,16 +372,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( stoneage_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x8800, 0x8801) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki1", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki1", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( stoneage_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki1", okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki1", okim6295_w) ADDRESS_MAP_END /*********************************************************** @@ -761,7 +761,7 @@ static void sound_irq2(const device_config *device, int state) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { /* the second OKIM6295 ROM is bank switched */ - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki2"), (data & 1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki2"), (data & 1) * 0x40000); } static const ym2151_interface ym2151_config = diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 6f92bcc59cb..e4b30c4aed0 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -476,10 +476,10 @@ static INTERRUPT_GEN ( sound_interrupt ) { if (!nmimask) cpu_set_input_line(devi static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM // AM_RANGE(0x1000, 0x1000) AM_WRITE(nmiack_w) - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xd000, 0xd000) AM_WRITE(nmimask_w) AM_RANGE(0xe000, 0xffff) AM_ROM diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index c6645010664..fcfa73fb058 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -197,14 +197,14 @@ static ADDRESS_MAP_START( quizmstr_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(question_r) AM_RANGE(0x00, 0x03) AM_WRITE(question_w) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x41, 0x41) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x48, 0x4b) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x41, 0x41) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x48, 0x4b) AM_DEVREADWRITE("pia0", pia_r, pia_w) AM_RANGE(0x50, 0x53) AM_READNOP AM_RANGE(0x50, 0x53) AM_WRITENOP - AM_RANGE(0x58, 0x5b) AM_DEVREADWRITE(PIA6821, "pia2", pia_r, pia_w) - AM_RANGE(0x70, 0x70) AM_DEVWRITE(H46505, "crtc", mc6845_address_w) - AM_RANGE(0x71, 0x71) AM_DEVWRITE(H46505, "crtc", mc6845_register_w) + AM_RANGE(0x58, 0x5b) AM_DEVREADWRITE("pia2", pia_r, pia_w) + AM_RANGE(0x70, 0x70) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x71, 0x71) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xc0, 0xc3) AM_READNOP AM_RANGE(0xc0, 0xc3) AM_WRITENOP ADDRESS_MAP_END @@ -213,13 +213,13 @@ static ADDRESS_MAP_START( trailblz_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(question_r) AM_RANGE(0x00, 0x03) AM_WRITE(question_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(H46505, "crtc", mc6845_address_w) - AM_RANGE(0x41, 0x41) AM_DEVWRITE(H46505, "crtc", mc6845_register_w) - AM_RANGE(0x48, 0x49) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x49, 0x49) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x50, 0x53) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) //? - AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x70, 0x73) AM_DEVREADWRITE(PIA6821, "pia2", pia_r, pia_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x41, 0x41) AM_DEVWRITE("crtc", mc6845_register_w) + AM_RANGE(0x48, 0x49) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x49, 0x49) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("pia0", pia_r, pia_w) //? + AM_RANGE(0x60, 0x63) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x70, 0x73) AM_DEVREADWRITE("pia2", pia_r, pia_w) AM_RANGE(0xc1, 0xc3) AM_WRITENOP ADDRESS_MAP_END @@ -231,29 +231,29 @@ static ADDRESS_MAP_START( supnudg2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x41) AM_READNOP AM_RANGE(0x40, 0x43) AM_WRITENOP AM_RANGE(0x43, 0x43) AM_READNOP - AM_RANGE(0x48, 0x48) AM_DEVWRITE(H46505, "crtc", mc6845_address_w) - AM_RANGE(0x49, 0x49) AM_DEVWRITE(H46505, "crtc", mc6845_register_w) + AM_RANGE(0x48, 0x48) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x49, 0x49) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x50, 0x51) AM_READNOP AM_RANGE(0x50, 0x53) AM_WRITENOP AM_RANGE(0x53, 0x53) AM_READNOP AM_RANGE(0x68, 0x69) AM_READNOP AM_RANGE(0x68, 0x6b) AM_WRITENOP AM_RANGE(0x6b, 0x6b) AM_READNOP - AM_RANGE(0x78, 0x79) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x79, 0x79) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x78, 0x79) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x79, 0x79) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xc0, 0xc1) AM_READNOP AM_RANGE(0xc0, 0xc3) AM_WRITENOP ADDRESS_MAP_END static ADDRESS_MAP_START( pokeroul_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(H46505, "crtc", mc6845_address_w) - AM_RANGE(0x41, 0x41) AM_DEVWRITE(H46505, "crtc", mc6845_register_w) - AM_RANGE(0x48, 0x49) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x49, 0x49) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x58, 0x5b) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) /* confirmed */ - AM_RANGE(0x68, 0x6b) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) /* confirmed */ - AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE(PIA6821, "pia2", pia_r, pia_w) /* confirmed */ + AM_RANGE(0x40, 0x40) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x41, 0x41) AM_DEVWRITE("crtc", mc6845_register_w) + AM_RANGE(0x48, 0x49) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x49, 0x49) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x58, 0x5b) AM_DEVREADWRITE("pia0", pia_r, pia_w) /* confirmed */ + AM_RANGE(0x68, 0x6b) AM_DEVREADWRITE("pia1", pia_r, pia_w) /* confirmed */ + AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE("pia2", pia_r, pia_w) /* confirmed */ AM_RANGE(0xc0, 0xc1) AM_READ(ff_r) /* needed to boot */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 916eef0b676..58e6a616c6e 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -376,7 +376,7 @@ static MACHINE_RESET( cojag ) cojag_sound_reset(machine); /* reset the IDE controller */ - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } @@ -785,7 +785,7 @@ static ADDRESS_MAP_START( r3000_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x04000000, 0x047fffff) AM_RAM AM_BASE(&jaguar_shared_ram) AM_SHARE(1) AM_RANGE(0x04800000, 0x04bfffff) AM_ROMBANK(1) AM_RANGE(0x04c00000, 0x04dfffff) AM_ROMBANK(2) - AM_RANGE(0x04e00000, 0x04e003ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_controller32_r, ide_controller32_w) + AM_RANGE(0x04e00000, 0x04e003ff) AM_DEVREADWRITE("ide", ide_controller32_r, ide_controller32_w) AM_RANGE(0x04f00000, 0x04f003ff) AM_READWRITE(jaguar_tom_regs32_r, jaguar_tom_regs32_w) AM_RANGE(0x04f00400, 0x04f007ff) AM_RAM AM_BASE(&jaguar_gpu_clut) AM_SHARE(2) AM_RANGE(0x04f02100, 0x04f021ff) AM_READWRITE(gpuctrl_r, gpuctrl_w) @@ -819,7 +819,7 @@ static ADDRESS_MAP_START( m68020_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xa40000, 0xa40003) AM_WRITE(eeprom_enable_w) AM_RANGE(0xb70000, 0xb70003) AM_READWRITE(misc_control_r, misc_control_w) AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK(2) - AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_controller32_r, ide_controller32_w) + AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE("ide", ide_controller32_r, ide_controller32_w) AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE(jaguar_tom_regs32_r, jaguar_tom_regs32_w) AM_RANGE(0xf00400, 0xf007ff) AM_RAM AM_BASE(&jaguar_gpu_clut) AM_SHARE(2) AM_RANGE(0xf02100, 0xf021ff) AM_READWRITE(gpuctrl_r, gpuctrl_w) @@ -847,7 +847,7 @@ static ADDRESS_MAP_START( gpu_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_SHARE(1) AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK(8) AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK(9) - AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_controller32_r, ide_controller32_w) + AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE("ide", ide_controller32_r, ide_controller32_w) AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE(jaguar_tom_regs32_r, jaguar_tom_regs32_w) AM_RANGE(0xf00400, 0xf007ff) AM_RAM AM_SHARE(2) AM_RANGE(0xf02100, 0xf021ff) AM_READWRITE(gpuctrl_r, gpuctrl_w) diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 76fc37e7a63..fe5bf504d81 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -326,8 +326,8 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x9001) AM_DEVREAD(SOUND, "ym", ym2203_r) /* YM 2203 */ - AM_RANGE(0x9008, 0x9009) AM_DEVREAD(SOUND, "ym", ym2203_r) /* ??? */ + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2203_r) /* YM 2203 */ + AM_RANGE(0x9008, 0x9009) AM_DEVREAD("ym", ym2203_r) /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r? */ AM_RANGE(0x8800, 0xfffb) AM_READ(SMH_ROM) /* ROM? */ AM_RANGE(0xfffc, 0xffff) AM_READ(SMH_RAM) /* ??? */ @@ -337,7 +337,7 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2203_w) /* YM 2203 */ + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2203_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(SMH_ROM) /* ROM */ @@ -348,18 +348,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( combasc_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ - AM_RANGE(0xb000, 0xb000) AM_DEVREAD(SOUND, "upd", combasc_busy_r) /* upd7759 busy? */ + AM_RANGE(0xb000, 0xb000) AM_DEVREAD("upd", combasc_busy_r) /* upd7759 busy? */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r? */ - AM_RANGE(0xe000, 0xe001) AM_DEVREAD(SOUND, "ym", combasc_ym2203_r) /* YM 2203 intercepted */ + AM_RANGE(0xe000, 0xe001) AM_DEVREAD("ym", combasc_ym2203_r) /* YM 2203 intercepted */ ADDRESS_MAP_END static ADDRESS_MAP_START( combasc_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "upd", combasc_play_w) /* upd7759 play voice */ - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "upd", upd7759_port_w) /* upd7759 voice select */ - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "upd", combasc_voice_reset_w) /* upd7759 reset? */ - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym", ym2203_w) /* YM 2203 */ + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("upd", combasc_play_w) /* upd7759 play voice */ + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("upd", upd7759_port_w) /* upd7759 voice select */ + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("upd", combasc_voice_reset_w) /* upd7759 reset? */ + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym", ym2203_w) /* YM 2203 */ ADDRESS_MAP_END diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 6dc2bd75104..48d9f2fb29b 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -87,8 +87,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x8002, 0x8003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x8002, 0x8003) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index e84fa0e9910..97e6fd47057 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -60,7 +60,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3001, 0x3001) AM_READ_PORT("P2") AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1") AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2") - AM_RANGE(0x3800, 0x3801) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x3800, 0x3801) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -72,7 +72,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x3801) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x3800, 0x3801) AM_DEVWRITE("ym", ym2203_w) 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 4914a8ba16c..aa9ef804885 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -108,13 +108,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(soundlatch_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x2000, 0x2001) AM_DEVREAD("ym", ym2151_r) 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, 0x2001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym", ym2151_w) 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) diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index 2ec07be8245..b104b8a77b4 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -540,7 +540,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dsp_io_map, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x00, 0x01) AM_WRITE(dsp_romaddr_w) AM_RANGE(0x02, 0x02) AM_READWRITE(dsp_cmd_r, dsp_answer_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "dac", dsp_dac_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac", dsp_dac_w) AM_RANGE(0x04, 0x04) AM_READ(dsp_rom_r) AM_RANGE(0x05, 0x05) AM_READ_PORT("IN0") AM_RANGE(0x07, 0x07) AM_READ_PORT("IN1") diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index f67b88baed7..d63392ea945 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -185,9 +185,9 @@ ADDRESS_MAP_END // (see also Model 3): static ADDRESS_MAP_START( system_h1_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_RAM -// AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE(SOUND, "scsp1", scsp_r, scsp_w) +// AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp1", scsp_r, scsp_w) AM_RANGE(0x200000, 0x27ffff) AM_RAM -// AM_RANGE(0x300000, 0x300fff) AM_DEVREADWRITE(SOUND, "scsp2", scsp_r, scsp_w) +// AM_RANGE(0x300000, 0x300fff) AM_DEVREADWRITE("scsp2", scsp_r, scsp_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index 4d698761d94..b498d425435 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -152,9 +152,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay3", ay8910_address_data_w) AM_RANGE(0x06, 0x06) AM_READ(cop01_sound_command_r) ADDRESS_MAP_END @@ -164,7 +164,7 @@ static READ8_HANDLER( kludge ) { static int timer; return timer++; } static ADDRESS_MAP_START( mightguy_audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym3526_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3526_w) AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) /* 1412M2? */ AM_RANGE(0x03, 0x03) AM_WRITE(SMH_NOP) /* 1412M2? */ AM_RANGE(0x03, 0x03) AM_READ(kludge) /* 1412M2? */ diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 81301d2f910..eb36ecee157 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -59,7 +59,7 @@ static UINT32 pixel_clock = 0; static WRITE8_HANDLER( panic_sound_output_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); static int sound_enabled=1; /* Sound Enable / Disable */ @@ -117,7 +117,7 @@ static WRITE8_HANDLER( panic_sound_output_w ) sample_stop(samples, 4); break; - case 10: dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), data); break;/* Bonus */ + case 10: dac_data_w(devtag_get_device(space->machine, "dac"), data); break;/* Bonus */ case 15: if (data) sample_start(samples, 0, 6, 0); break; /* Player Die */ case 16: if (data) sample_start(samples, 5, 7, 0); break; /* Enemy Laugh */ case 17: if (data) sample_start(samples, 0, 10, 0); break; /* Coin - Not triggered by software */ @@ -136,7 +136,7 @@ static WRITE8_HANDLER( panic_sound_output2_w ) static WRITE8_HANDLER( cosmicg_output_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); static int march_select; static int gun_die_select; static int sound_enabled; @@ -160,7 +160,7 @@ static WRITE8_HANDLER( cosmicg_output_w ) /* as other cosmic series games, but it never seems to */ /* be used for anything. It is implemented for sake of */ /* completness. Maybe it plays a tune if you win ? */ - case 1: dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), -data); break; + case 1: dac_data_w(devtag_get_device(space->machine, "dac"), -data); break; case 2: if (data) sample_start (samples, 0, march_select, 0); break; /* March Sound */ case 3: march_select = (march_select & 0xfe) | data; break; case 4: march_select = (march_select & 0xfd) | (data << 1); break; @@ -203,7 +203,7 @@ static WRITE8_HANDLER( cosmicg_output_w ) static WRITE8_HANDLER( cosmica_sound_output_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); static int sound_enabled=1; static int dive_bomb_b_select=0; @@ -539,7 +539,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magspot_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x4800, 0x4800) AM_DEVWRITE("dac", dac_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(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) @@ -1596,7 +1596,7 @@ static DRIVER_INIT( devzone ) static DRIVER_INIT( nomnlnd ) { - const device_config *dac = devtag_get_device(machine, SOUND, "dac"); + const device_config *dac = devtag_get_device(machine, "dac"); memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x5000, 0x5001, 0, 0, nomnlnd_port_0_1_r); memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x4800, 0x4800, 0, 0, SMH_NOP); memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x4807, 0x4807, 0, 0, cosmic_background_enable_w); diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index 2343eb5e6e0..25076e4ce41 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -107,7 +107,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map_sound_cowrace, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym", ym2203_w) ADDRESS_MAP_END @@ -155,9 +155,9 @@ static const ym2203_interface ym2203_interface_1 = AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, DEVCB_MEMORY_HANDLER("audiocpu", PROGRAM, soundlatch_r), // read A - DEVCB_DEVICE_HANDLER(SOUND, "oki", okim6295_r), // read B - DEVCB_NULL, // write A - DEVCB_DEVICE_HANDLER(SOUND, "oki", okim6295_w) // write B + DEVCB_DEVICE_HANDLER("oki", okim6295_r), // read B + DEVCB_NULL, // write A + DEVCB_DEVICE_HANDLER("oki", okim6295_w) // write B }, NULL }; diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index fe7e19789f4..88705b86d3b 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -632,10 +632,10 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xd000, 0xd7ff) AM_RAM - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE(SOUND, "2151", ym2151_r, ym2151_w) - AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("2151", ym2151_r, ym2151_w) + AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xf004, 0xf004) AM_WRITE(cps1_snd_bankswitch_w) - AM_RANGE(0xf006, 0xf006) AM_DEVWRITE(SOUND, "oki", cps1_oki_pin7_w) /* controls pin 7 of OKI chip */ + AM_RANGE(0xf006, 0xf006) AM_DEVWRITE("oki", cps1_oki_pin7_w) /* controls pin 7 of OKI chip */ AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) /* Sound command */ AM_RANGE(0xf00a, 0xf00a) AM_READ(soundlatch2_r) /* Sound timer fade */ ADDRESS_MAP_END @@ -663,9 +663,9 @@ ADDRESS_MAP_START( qsound_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) // used by cps2.c AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* banked (contains music data) */ AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&qsound_sharedram1) - AM_RANGE(0xd000, 0xd002) AM_DEVWRITE(SOUND, "qsound", qsound_w) + AM_RANGE(0xd000, 0xd002) AM_DEVWRITE("qsound", qsound_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(qsound_banksw_w) - AM_RANGE(0xd007, 0xd007) AM_DEVREAD(SOUND, "qsound", qsound_r) + AM_RANGE(0xd007, 0xd007) AM_DEVREAD("qsound", qsound_r) AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(&qsound_sharedram2) ADDRESS_MAP_END diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index 08294653b54..ae890f64b7b 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -159,8 +159,8 @@ static READ8_HANDLER( pc3259_r ) static WRITE8_HANDLER( port_sound_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); + const device_config *sn = devtag_get_device(space->machine, "sn"); /* D0 - interrupt enable - also goes to PC3259 as /HTCTRL */ cpu_interrupt_enable(space->machine->cpu[0], (data & 0x01) ? TRUE : FALSE); @@ -224,7 +224,7 @@ static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) 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_DEVWRITE(SOUND, "discrete", crbaloon_audio_set_music_freq) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", crbaloon_audio_set_music_freq) 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(SMH_NOP) /* MSK - to PC3259 */ @@ -343,7 +343,7 @@ GFXDECODE_END static MACHINE_RESET( crballoon ) { const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO); - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); pc3092_reset(); port_sound_w(space, 0, 0); diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 3be76090dda..115e84697d0 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -258,7 +258,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay", ay8910_address_data_w) 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) @@ -580,7 +580,7 @@ ROM_END static DRIVER_INIT( crgolfhi ) { - const device_config *msm = devtag_get_device(machine, SOUND, "msm"); + const device_config *msm = devtag_get_device(machine, "msm"); memory_install_write8_device_handler(cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_PROGRAM), msm, 0xa000, 0xa003, 0, 0, crgolfhi_sample_w); } diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 27ec6b38337..63b14b7c2e7 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -46,7 +46,7 @@ static WRITE8_DEVICE_HANDLER( crimfght_snd_bankswitch_w ) int bank_A = ((data >> 1) & 0x01); int bank_B = ((data) & 0x01); - k007232_set_bank( devtag_get_device(device->machine, SOUND, "konami"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(device->machine, "konami"), bank_A, bank_B ); } @@ -82,16 +82,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crimfght_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM 821l01.h4 */ AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM2151 */ + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym", ym2151_r) /* YM2151 */ AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* soundlatch_r */ - AM_RANGE(0xe000, 0xe00d) AM_DEVREAD(SOUND, "konami", k007232_r) /* 007232 registers */ + AM_RANGE(0xe000, 0xe00d) AM_DEVREAD("konami", k007232_r) /* 007232 registers */ ADDRESS_MAP_END static ADDRESS_MAP_START( crimfght_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM 821l01.h4 */ AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM2151 */ - AM_RANGE(0xe000, 0xe00d) AM_DEVWRITE(SOUND, "konami", k007232_w) /* 007232 registers */ + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym2151_w) /* YM2151 */ + AM_RANGE(0xe000, 0xe00d) AM_DEVWRITE("konami", k007232_w) /* 007232 registers */ ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index c109cbe1269..afe56bcf2bb 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -138,8 +138,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crospang_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) - AM_RANGE(0x02, 0x02) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 7a91a5b0143..ffeb3c23ab9 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -237,7 +237,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(crshrace_sh_bankswitch_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 0fa1f094a8c..04158448b8e 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -440,7 +440,7 @@ static ADDRESS_MAP_START( crystal_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03000000, 0x0300ffff) AM_RAM AM_BASE(&vidregs) AM_RANGE(0x03800000, 0x03ffffff) AM_RAM AM_BASE(&textureram) AM_RANGE(0x04000000, 0x047fffff) AM_RAM AM_BASE(&frameram) - AM_RANGE(0x04800000, 0x04800fff) AM_DEVREADWRITE(SOUND, "vrender", vr0_snd_read, vr0_snd_write) + AM_RANGE(0x04800000, 0x04800fff) AM_DEVREADWRITE("vrender", vr0_snd_read, vr0_snd_write) AM_RANGE(0x05000000, 0x05000003) AM_READ(FlashCmd_r) AM_WRITE(FlashCmd_w) AM_RANGE(0x05000000, 0x05ffffff) AM_READ(SMH_BANK1) @@ -531,7 +531,7 @@ static MACHINE_RESET(crystal) timer_adjust_oneshot(Timer[i],attotime_never,0); } - vr0_snd_set_areas(devtag_get_device(machine, SOUND, "vrender"), textureram,frameram); + vr0_snd_set_areas(devtag_get_device(machine, "vrender"), textureram,frameram); #ifdef IDLE_LOOP_SPEEDUP FlipCntRead=0; #endif diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 37371f3f94e..a80b499c4dc 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -324,8 +324,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_WRITE(SMH_NOP) // AM_DEVWRITE(SOUND, "ym1", ym2203_w) ? - AM_RANGE(0xc800, 0xc801) AM_WRITE(SMH_NOP) // AM_DEVWRITE(SOUND, "ym2", ym2203_w) ? + AM_RANGE(0xc000, 0xc001) AM_WRITE(SMH_NOP) // AM_DEVWRITE("ym1", ym2203_w) ? + AM_RANGE(0xc800, 0xc801) AM_WRITE(SMH_NOP) // AM_DEVWRITE("ym2", ym2203_w) ? AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -335,8 +335,8 @@ static ADDRESS_MAP_START( s2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( s2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x4000, 0x4001) AM_WRITE(SMH_NOP) // AM_DEVWRITE(SOUND, "ym1", ym2203_w) ? - AM_RANGE(0x4008, 0x4009) AM_WRITE(SMH_NOP) // AM_DEVWRITE(SOUND, "ym2", ym2203_w) ? + AM_RANGE(0x4000, 0x4001) AM_WRITE(SMH_NOP) // AM_DEVWRITE("ym1", ym2203_w) ? + AM_RANGE(0x4008, 0x4009) AM_WRITE(SMH_NOP) // AM_DEVWRITE("ym2", ym2203_w) ? ADDRESS_MAP_END diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c index e1ed07c3dc6..be2fc086c69 100644 --- a/src/mame/drivers/cubeqst.c +++ b/src/mame/drivers/cubeqst.c @@ -435,7 +435,7 @@ ADDRESS_MAP_END static MACHINE_START( cubeqst ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } static MACHINE_RESET( cubeqst ) @@ -475,7 +475,7 @@ static void sound_dac_w(const device_config *device, UINT16 data) "rdac6", "ldac6", "rdac7", "ldac7" }; - dac_signed_data_16_w(devtag_get_device(device->machine, SOUND, dacs[data & 15]), (data & 0xfff0) ^ 0x8000); + dac_signed_data_16_w(devtag_get_device(device->machine, dacs[data & 15]), (data & 0xfff0) ^ 0x8000); } static const cubeqst_snd_config snd_config = diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index a7f95ec30bc..595d2cc1a80 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -88,7 +88,7 @@ static WRITE32_HANDLER( aga_overlay_w ) static WRITE8_DEVICE_HANDLER( cd32_cia_0_porta_w ) { /* bit 1 = cd audio mute */ - sound_set_output_gain(devtag_get_device(device->machine, SOUND, "cdda"), 0, ( data & 1 ) ? 0.0 : 1.0 ); + sound_set_output_gain(devtag_get_device(device->machine, "cdda"), 0, ( data & 1 ) ? 0.0 : 1.0 ); /* bit 2 = Power Led on Amiga */ set_led_status(0, (data & 2) ? 0 : 1); diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 3b03099b2c0..2686ec1f03b 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -165,7 +165,7 @@ static ADDRESS_MAP_START( cultures_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x80) AM_WRITE(cpu_bankswitch_w) AM_RANGE(0x90, 0x90) AM_WRITE(misc_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(bg_bank_w) - AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xd0, 0xd0) AM_READ_PORT("SW1_A") AM_RANGE(0xd1, 0xd1) AM_READ_PORT("SW1_B") AM_RANGE(0xd2, 0xd2) AM_READ_PORT("SW2_A") diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 009cb653ac4..22922f7ba70 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -418,7 +418,7 @@ static void cvs_set_speech_command_w(const address_space *space, UINT8 data) static READ8_HANDLER( cvs_speech_command_r ) { /* bit 7 is TMS status (active LO) */ - return (~tms5110_status_r(devtag_get_device(space->machine, SOUND, "tms"), 0) << 7) | soundlatch2_r(space, 0); + return (~tms5110_status_r(devtag_get_device(space->machine, "tms"), 0) << 7) | soundlatch2_r(space, 0); } @@ -489,7 +489,7 @@ static WRITE8_HANDLER( audio_command_w ) /* temporary code begin */ if ((data & 0x40) == 0) - speech_execute_command(devtag_get_device(space->machine, SOUND, "tms"), data & 0x03f); + speech_execute_command(devtag_get_device(space->machine, "tms"), data & 0x03f); /* temporary code end */ } @@ -568,8 +568,8 @@ static ADDRESS_MAP_START( cvs_dac_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1000, 0x107f) AM_RAM AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) - AM_RANGE(0x1840, 0x1840) AM_DEVWRITE(SOUND, "dac1", dac_w) - AM_RANGE(0x1880, 0x1883) AM_DEVWRITE(SOUND, "dac2", cvs_4_bit_dac_data_w) AM_BASE(&cvs_4_bit_dac_data) + AM_RANGE(0x1840, 0x1840) AM_DEVWRITE("dac1", dac_w) + AM_RANGE(0x1880, 0x1883) AM_DEVWRITE("dac2", cvs_4_bit_dac_data_w) AM_BASE(&cvs_4_bit_dac_data) AM_RANGE(0x1884, 0x1887) AM_WRITE(SMH_NOP) /* not connected to anything */ ADDRESS_MAP_END @@ -592,8 +592,8 @@ static ADDRESS_MAP_START( cvs_speech_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1d00, 0x1d00) AM_WRITE(cvs_speech_rom_address_lo_w) AM_RANGE(0x1d40, 0x1d40) AM_WRITE(cvs_speech_rom_address_hi_w) AM_RANGE(0x1d80, 0x1d80) AM_READ(cvs_speech_command_r) - AM_RANGE(0x1ddd, 0x1dde) AM_DEVWRITE(SOUND, "tms", cvs_tms5110_ctl_w) AM_BASE(&cvs_tms5110_ctl_data) - AM_RANGE(0x1ddf, 0x1ddf) AM_DEVWRITE(SOUND, "tms", cvs_tms5110_pdc_w) + AM_RANGE(0x1ddd, 0x1dde) AM_DEVWRITE("tms", cvs_tms5110_ctl_w) AM_BASE(&cvs_tms5110_ctl_data) + AM_RANGE(0x1ddf, 0x1ddf) AM_DEVWRITE("tms", cvs_tms5110_pdc_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index c73f86b1258..842822c0d6f 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -187,7 +187,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x2800, 0x2801) AM_WRITE(cyberbal_sound_68k_6502_w) AM_RANGE(0x2802, 0x2803) AM_READWRITE(atarigen_6502_irq_ack_r, atarigen_6502_irq_ack_w) AM_RANGE(0x2804, 0x2805) AM_WRITE(atarigen_6502_sound_w) diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index 228e8b4f37e..07b76db6816 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -393,8 +393,8 @@ static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff ) AM_ROM AM_RANGE(0x8000, 0x9fff ) AM_RAM AM_RANGE(0xa001, 0xa001 ) AM_READ(soundport_r) - AM_RANGE(0xa000, 0xa001 ) AM_DEVREADWRITE(SOUND, "ym1", y8950_r, y8950_w) - AM_RANGE(0xc000, 0xc001 ) AM_DEVREADWRITE(SOUND, "ym2", y8950_r, y8950_w) + AM_RANGE(0xa000, 0xa001 ) AM_DEVREADWRITE("ym1", y8950_r, y8950_w) + AM_RANGE(0xc000, 0xc001 ) AM_DEVREADWRITE("ym2", y8950_r, y8950_w) ADDRESS_MAP_END static INPUT_PORTS_START( cybertnk ) diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 98631ec03fd..c30bcce88db 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -136,9 +136,9 @@ static ADDRESS_MAP_START( snd_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x08, 0x08) AM_WRITE(snd_irq_w) AM_RANGE(0x0c, 0x0c) AM_WRITE(snd_ack_w) AM_RANGE(0x80, 0x80) AM_WRITE(adpcm_w) - AM_RANGE(0x86, 0x87) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x8a, 0x8b) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x8e, 0x8f) AM_DEVWRITE(SOUND, "ay3", ay8910_data_address_w) + AM_RANGE(0x86, 0x87) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x8a, 0x8b) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x8e, 0x8f) AM_DEVWRITE("ay3", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index 555d6853649..1ccf119cf8d 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -339,8 +339,8 @@ static UINT8 darius_pan[DARIUS_PAN_MAX]; static void update_fm0( running_machine *machine ) { - const device_config *lvol = devtag_get_device(machine, SOUND, "filter0.3l"); - const device_config *rvol = devtag_get_device(machine, SOUND, "filter0.3r"); + const device_config *lvol = devtag_get_device(machine, "filter0.3l"); + const device_config *rvol = devtag_get_device(machine, "filter0.3r"); int left, right; left = ( darius_pan[0] * darius_vol[6])>>8; right = ((0xff - darius_pan[0]) * darius_vol[6])>>8; @@ -352,8 +352,8 @@ static void update_fm0( running_machine *machine ) static void update_fm1( running_machine *machine ) { - const device_config *lvol = devtag_get_device(machine, SOUND, "filter1.3l"); - const device_config *rvol = devtag_get_device(machine, SOUND, "filter1.3r"); + const device_config *lvol = devtag_get_device(machine, "filter1.3l"); + const device_config *rvol = devtag_get_device(machine, "filter1.3r"); int left, right; left = ( darius_pan[1] * darius_vol[7])>>8; right = ((0xff - darius_pan[1]) * darius_vol[7])>>8; @@ -366,8 +366,8 @@ static void update_fm1( running_machine *machine ) static void update_psg0( running_machine *machine, int port ) { static const char *fltname[3][2] = { { "filter0.0l", "filter0.0r" }, { "filter0.1l", "filter0.1r" }, { "filter0.2l", "filter0.2r" } }; - const device_config *lvol = devtag_get_device(machine, SOUND, fltname[port][0]); - const device_config *rvol = devtag_get_device(machine, SOUND, fltname[port][1]); + const device_config *lvol = devtag_get_device(machine, fltname[port][0]); + const device_config *rvol = devtag_get_device(machine, fltname[port][1]); int left, right; left = ( darius_pan[2] * darius_vol[port])>>8; right = ((0xff - darius_pan[2]) * darius_vol[port])>>8; @@ -380,8 +380,8 @@ static void update_psg0( running_machine *machine, int port ) static void update_psg1( running_machine *machine, int port ) { static const char *fltname[3][2] = { { "filter0.0l", "filter0.0r" }, { "filter0.1l", "filter0.1r" }, { "filter0.2l", "filter0.2r" } }; - const device_config *lvol = devtag_get_device(machine, SOUND, fltname[port][0]); - const device_config *rvol = devtag_get_device(machine, SOUND, fltname[port][1]); + const device_config *lvol = devtag_get_device(machine, fltname[port][0]); + const device_config *rvol = devtag_get_device(machine, fltname[port][1]); int left, right; left = ( darius_pan[3] * darius_vol[port + 3])>>8; right = ((0xff - darius_pan[3]) * darius_vol[port + 3])>>8; @@ -393,8 +393,8 @@ static void update_psg1( running_machine *machine, int port ) static void update_da( running_machine *machine ) { - const device_config *lvol = devtag_get_device(machine, SOUND, "msm5205.l"); - const device_config *rvol = devtag_get_device(machine, SOUND, "msm5205.r"); + const device_config *lvol = devtag_get_device(machine, "msm5205.l"); + const device_config *rvol = devtag_get_device(machine, "msm5205.r"); int left, right; left = darius_def_vol[(darius_pan[4]>>4)&0x0f]; right = darius_def_vol[(darius_pan[4]>>0)&0x0f]; @@ -489,8 +489,8 @@ static WRITE8_DEVICE_HANDLER( darius_write_portB1 ) static ADDRESS_MAP_START( darius_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym2", ym2203_r) AM_RANGE(0xb000, 0xb000) AM_READ(SMH_NOP) AM_RANGE(0xb001, 0xb001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -498,8 +498,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( darius_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym2", ym2203_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(taitosound_slave_comm_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(darius_fm0_pan) @@ -573,7 +573,7 @@ static ADDRESS_MAP_START( darius_sound2_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(adpcm_command_read, adpcm_nmi_disable) AM_RANGE(0x01, 0x01) AM_WRITE(adpcm_nmi_enable) - AM_RANGE(0x02, 0x02) AM_READ(readport2) AM_DEVWRITE(SOUND, "msm", adpcm_data_w) /* readport2 ??? */ + AM_RANGE(0x02, 0x02) AM_READ(readport2) AM_DEVWRITE("msm", adpcm_data_w) /* readport2 ??? */ AM_RANGE(0x03, 0x03) AM_READ(readport3) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 66fd476069b..4dfbffd209c 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -304,7 +304,7 @@ static ADDRESS_MAP_START( darkhors_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x580000, 0x580003) AM_READ_PORT("580000") AM_RANGE(0x580004, 0x580007) AM_READ_PORT("580004") AM_RANGE(0x580008, 0x58000b) AM_READ( darkhors_input_sel_r ) - AM_RANGE(0x580084, 0x580087) AM_DEVREAD8( SOUND, "oki", okim6295_r, 0xff000000 ) + AM_RANGE(0x580084, 0x580087) AM_DEVREAD8( "oki", okim6295_r, 0xff000000 ) AM_RANGE(0x580200, 0x580203) AM_READ( SMH_NOP ) AM_RANGE(0x580400, 0x580403) AM_READ_PORT("580400") AM_RANGE(0x580420, 0x580423) AM_READ_PORT("580420") @@ -317,7 +317,7 @@ static ADDRESS_MAP_START( darkhors_writemem, ADDRESS_SPACE_PROGRAM, 32 ) 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_DEVWRITE8( SOUND, "oki", okim6295_w, 0xff000000 ) + AM_RANGE(0x580084, 0x580087) AM_DEVWRITE8( "oki", okim6295_w, 0xff000000 ) 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) diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index 921588f7696..78f177aa25f 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -103,20 +103,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym2", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x100000, 0x100001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym2", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym2", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x100000, 0x100001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym2", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 3328e2ee473..e47ff7e56fc 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -271,20 +271,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym2", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x100000, 0x100001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym2", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym2", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x100000, 0x100001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym2", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) @@ -540,7 +540,7 @@ static void sound_irq(const device_config *device, int state) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { /* the second OKIM6295 ROM is bank switched */ - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki2"), (data & 1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki2"), (data & 1) * 0x40000); } static const ym2151_interface ym2151_config = diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index bb79b82463a..9daca5f673e 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -468,11 +468,11 @@ static READ8_HANDLER(irq_latch_r) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2151_status_port_r,ym2151_w) - AM_RANGE(0xb000, 0xb000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r,okim6295_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_status_port_r,ym2151_w) + AM_RANGE(0xb000, 0xb000) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) AM_RANGE(0xd000, 0xd000) AM_READ(irq_latch_r) //timing? sound latch? - AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r,okim6295_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 841cbc1c551..6f0c7c50e4a 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -183,16 +183,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dbz_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_RAM) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0xd000, 0xd002) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0xd000, 0xd002) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( dbz_sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index b819782b61e..fdd52487c0d 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -182,7 +182,7 @@ static WRITE8_HANDLER( sound_control_w ) /* bit 0x20 = LED */ /* bit 0x40 = BSMT2000 reset */ if ((diff & 0x40) && (data & 0x40)) - devtag_reset(space->machine, SOUND, "bsmt"); + devtag_reset(space->machine, "bsmt"); if (data != 0x40 && data != 0x60) logerror("%04X:sound_control_w = %02X\n", cpu_get_pc(space->cpu), data); } @@ -231,7 +231,7 @@ static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_READWRITE(sound_status_r, sound_control_w) AM_RANGE(0x0800, 0x0fff) AM_READ(sound_command_r) - AM_RANGE(0x1000, 0x10ff) AM_MIRROR(0x0700) AM_DEVWRITE(SOUND, "bsmt", bsmt_data_w) + AM_RANGE(0x1000, 0x10ff) AM_MIRROR(0x0700) AM_DEVWRITE("bsmt", bsmt_data_w) AM_RANGE(0x1800, 0x1fff) AM_RAM AM_RANGE(0x2000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c index a9682c11f5d..6dc2b391d35 100644 --- a/src/mame/drivers/dday.c +++ b/src/mame/drivers/dday.c @@ -91,8 +91,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_RAM) - AM_RANGE(0x6400, 0x6401) AM_MIRROR(0x000e) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x6800, 0x6801) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x6400, 0x6401) AM_MIRROR(0x000e) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x6800, 0x6801) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(dday_control_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index df3fa5bf084..3f2c69197a5 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -236,10 +236,10 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x7000, 0x7000) AM_WRITE(sound_nmi_w) - AM_RANGE(0x3000, 0x3000) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x5000, 0x5000) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x3000, 0x3000) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x5000, 0x5000) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay2", ay8910_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 2f70b5c7aa7..c175776496c 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -433,7 +433,7 @@ static ADDRESS_MAP_START( ddealer, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1") AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1") AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("UNK") - AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8(SOUND, "ym", ym2203_w, 0x00ff) // ym ? + AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8("ym", ym2203_w, 0x00ff) // ym ? AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) // palette ram AM_RANGE(0x08c000, 0x08cfff) AM_RAM_WRITE(ddealer_vregs_w) AM_BASE(&ddealer_vregs) // palette ram diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 80a03023bd8..7a36bebe2e3 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1581,9 +1581,9 @@ static ADDRESS_MAP_START( quiz365_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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) AM_RANGE(0x300286, 0x300287) AM_READ(ddenlovr_gfxrom_r) // Video Chip - AM_RANGE(0x3002c0, 0x3002c1) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // Sound - AM_RANGE(0x300340, 0x30035f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC - AM_RANGE(0x300384, 0x300385) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) + AM_RANGE(0x3002c0, 0x3002c1) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // Sound + AM_RANGE(0x300340, 0x30035f) AM_DEVREAD8("rtc", msm6242_r, 0x00ff) // 6242RTC + AM_RANGE(0x300384, 0x300385) AM_DEVREAD8("ay", ay8910_r, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1602,13 +1602,13 @@ static ADDRESS_MAP_START( quiz365_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x30026a, 0x30026b) AM_WRITE(ddenlovr16_priority_w) AM_RANGE(0x30026c, 0x30026d) AM_WRITE(ddenlovr16_layer_enable_w) AM_RANGE(0x300280, 0x300283) AM_WRITE(ddenlovr_blitter_w) - AM_RANGE(0x300300, 0x300303) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x300340, 0x30035f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0x300300, 0x300303) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x300340, 0x30035f) AM_DEVWRITE8("rtc", msm6242_w, 0x00ff) // 6242RTC AM_RANGE(0x3003ca, 0x3003cb) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge - AM_RANGE(0x300380, 0x300383) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0x3002c0, 0x3002c1) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) - AM_RANGE(0x3003c2, 0x3003c3) AM_DEVWRITE(SOUND, "oki", quiz365_oki_bank1_w) - AM_RANGE(0x3003cc, 0x3003cd) AM_DEVWRITE(SOUND, "oki", quiz365_oki_bank2_w) + AM_RANGE(0x300380, 0x300383) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x3002c0, 0x3002c1) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) + AM_RANGE(0x3003c2, 0x3003c3) AM_DEVWRITE("oki", quiz365_oki_bank1_w) + AM_RANGE(0x3003cc, 0x3003cd) AM_DEVWRITE("oki", quiz365_oki_bank2_w) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1643,12 +1643,12 @@ static ADDRESS_MAP_START( ddenlvrj_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC + AM_RANGE(0x300100, 0x30011f) AM_DEVREAD8("rtc", msm6242_r, 0x00ff) // 6242RTC AM_RANGE(0x300180, 0x300181) AM_READ_PORT("P1") AM_RANGE(0x300182, 0x300183) AM_READ_PORT("P2") AM_RANGE(0x300184, 0x300185) AM_READ_PORT("SYSTEM") AM_RANGE(0x300186, 0x300187) AM_READ(ddenlvrj_dsw_r) // DSW - AM_RANGE(0x300240, 0x300241) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // Sound + AM_RANGE(0x300240, 0x300241) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1664,14 +1664,14 @@ static ADDRESS_MAP_START( ddenlvrj_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x30006a, 0x30006b) AM_WRITE(ddenlovr16_priority_w) AM_RANGE(0x30006c, 0x30006d) AM_WRITE(ddenlovr16_layer_enable_w) AM_RANGE(0x300080, 0x300083) AM_WRITE(ddenlovr_blitter_w) - AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x300100, 0x30011f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x300100, 0x30011f) AM_DEVWRITE8("rtc", msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) AM_RANGE(0x300188, 0x300189) AM_WRITE(ddenlvrj_coincounter_w) // Coin Counters AM_RANGE(0x30018a, 0x30018b) AM_WRITE(SMH_RAM) AM_BASE( &ddenlvrj_dsw_sel ) // DSW select - AM_RANGE(0x30018c, 0x30018d) AM_DEVWRITE(SOUND, "oki", ddenlovr_oki_bank_w) + AM_RANGE(0x30018c, 0x30018d) AM_DEVWRITE("oki", ddenlovr_oki_bank_w) AM_RANGE(0x3001ca, 0x3001cb) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge - AM_RANGE(0x300240, 0x300241) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x300240, 0x300241) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1697,7 +1697,7 @@ static READ16_HANDLER( ddenlvrk_protection2_r ) static WRITE16_HANDLER( ddenlvrk_protection2_w ) { COMBINE_DATA( ddenlvrk_protection2 ); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), ((*ddenlvrk_protection2)&0x7) * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), ((*ddenlvrk_protection2)&0x7) * 0x40000); } static ADDRESS_MAP_START( ddenlvrk_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1708,9 +1708,9 @@ static ADDRESS_MAP_START( ddenlvrk_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00102, 0xe00103) AM_READ_PORT("P2") AM_RANGE(0xe00104, 0xe00105) AM_READ_PORT("SYSTEM") AM_RANGE(0xe00200, 0xe00201) AM_READ_PORT("DSW") - AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC - AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) - AM_RANGE(0xe00700, 0xe00701) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // Sound + AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8("rtc", msm6242_r, 0x00ff) // 6242RTC + AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0xe00700, 0xe00701) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1733,11 +1733,11 @@ static ADDRESS_MAP_START( ddenlvrk_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00302, 0xe00303) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge 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, 0xe00403) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8("rtc", msm6242_w, 0x00ff) // 6242RTC // AM_RANGE(0xe00302, 0xe00303) AM_WRITE(SMH_NOP) // ? - AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0xe00700, 0xe00701) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xe00700, 0xe00701) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1752,15 +1752,15 @@ static ADDRESS_MAP_START( ddenlovr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00102, 0xe00103) AM_READ_PORT("P2") AM_RANGE(0xe00104, 0xe00105) AM_READ_PORT("SYSTEM") AM_RANGE(0xe00200, 0xe00201) AM_READ_PORT("DSW") - AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC - AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) - AM_RANGE(0xe00700, 0xe00701) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // Sound + AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8("rtc", msm6242_r, 0x00ff) // 6242RTC + AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0xe00700, 0xe00701) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // Sound 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(SMH_ROM) // ROM - AM_RANGE(0x300000, 0x300001) AM_DEVWRITE(SOUND, "oki", ddenlovr_oki_bank_w) + AM_RANGE(0x300000, 0x300001) AM_DEVWRITE("oki", ddenlovr_oki_bank_w) AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w) // Palette // AM_RANGE(0xd01000, 0xd017ff) SMH_RAM) // ? B0 on startup, then 00 AM_RANGE(0xe00040, 0xe00047) AM_WRITE(ddenlovr16_palette_base_w) @@ -1774,11 +1774,11 @@ static ADDRESS_MAP_START( ddenlovr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00302, 0xe00303) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge 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, 0xe00403) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8("rtc", msm6242_w, 0x00ff) // 6242RTC // AM_RANGE(0xe00302, 0xe00303) AM_WRITE(SMH_NOP) // ? - AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0xe00700, 0xe00701) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xe00700, 0xe00701) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1835,12 +1835,12 @@ static ADDRESS_MAP_START( nettoqc_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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 - AM_RANGE(0x300100, 0x30011f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC + AM_RANGE(0x300100, 0x30011f) AM_DEVREAD8("rtc", msm6242_r, 0x00ff) // 6242RTC AM_RANGE(0x300180, 0x300181) AM_READ_PORT("P1") AM_RANGE(0x300182, 0x300183) AM_READ_PORT("P2") AM_RANGE(0x300184, 0x300185) AM_READ_PORT("SYSTEM") AM_RANGE(0x300186, 0x300187) AM_READ(nettoqc_input_r) // DSW's - AM_RANGE(0x300240, 0x300241) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // Sound + AM_RANGE(0x300240, 0x300241) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1857,14 +1857,14 @@ static ADDRESS_MAP_START( nettoqc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x30006a, 0x30006b) AM_WRITE(ddenlovr16_priority_w) AM_RANGE(0x30006c, 0x30006d) AM_WRITE(ddenlovr16_layer_enable_w) AM_RANGE(0x300080, 0x300083) AM_WRITE(ddenlovr_blitter_w) - AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x300100, 0x30011f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x3000c0, 0x3000c3) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x300100, 0x30011f) AM_DEVWRITE8("rtc", msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0x300140, 0x300143) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) AM_RANGE(0x300188, 0x300189) AM_WRITE(nettoqc_coincounter_w) // Coin Counters AM_RANGE(0x30018a, 0x30018b) AM_WRITE(ddenlovr_select_16_w) // - AM_RANGE(0x30018c, 0x30018d) AM_DEVWRITE(SOUND, "oki", nettoqc_oki_bank_w) + AM_RANGE(0x30018c, 0x30018d) AM_DEVWRITE("oki", nettoqc_oki_bank_w) AM_RANGE(0x3001ca, 0x3001cb) AM_WRITE(ddenlovr_blitter_irq_ack_w) // Blitter irq acknowledge - AM_RANGE(0x300240, 0x300241) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x300240, 0x300241) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -1915,9 +1915,9 @@ static ADDRESS_MAP_START( quizchq_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x1b, 0x1b) AM_READ(rongrong_blitter_busy_r) AM_RANGE(0x1c, 0x1c) AM_READ(rongrong_input_r) AM_RANGE(0x22, 0x23) AM_READ(rongrong_input2_r) - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x40, 0x40) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0x98, 0x98) AM_READ(unk_r) // ? must be 78 on startup - AM_RANGE(0xa0, 0xaf) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0xa0, 0xaf) AM_DEVREAD("rtc", msm6242_r) // 6242RTC ADDRESS_MAP_END static ADDRESS_MAP_START( quizchq_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) @@ -1925,8 +1925,8 @@ static ADDRESS_MAP_START( quizchq_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x1b, 0x1b) AM_WRITE(rongrong_blitter_busy_w) AM_RANGE(0x1e, 0x1e) AM_WRITE(rongrong_select_w) AM_RANGE(0x20, 0x20) AM_WRITE(ddenlovr_select2_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x60, 0x61) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x60, 0x61) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -1934,8 +1934,8 @@ static ADDRESS_MAP_START( quizchq_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x94, 0x94) AM_WRITE(ddenlovr_bgcolor_w) AM_RANGE(0x95, 0x95) AM_WRITE(ddenlovr_priority_w) AM_RANGE(0x96, 0x96) AM_WRITE(ddenlovr_layer_enable_w) - AM_RANGE(0xa0, 0xaf) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC - AM_RANGE(0xc0, 0xc0) AM_DEVWRITE(SOUND, "oki", quizchq_oki_bank_w) + AM_RANGE(0xa0, 0xaf) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC + AM_RANGE(0xc0, 0xc0) AM_DEVWRITE("oki", quizchq_oki_bank_w) AM_RANGE(0xc2, 0xc2) AM_WRITE(SMH_NOP) // enables palette RAM at 8000 ADDRESS_MAP_END @@ -1958,8 +1958,8 @@ static ADDRESS_MAP_START( rongrong_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r) AM_RANGE(0x1b, 0x1b) AM_READ(rongrong_blitter_busy_r) AM_RANGE(0x1c, 0x1c) AM_READ(rongrong_input_r) - AM_RANGE(0x20, 0x2f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x20, 0x2f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC + AM_RANGE(0x40, 0x40) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0x98, 0x98) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0xa2, 0xa3) AM_READ(rongrong_input2_r) ADDRESS_MAP_END @@ -1968,9 +1968,9 @@ static ADDRESS_MAP_START( rongrong_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x00, 0x01) AM_WRITE(rongrong_blitter_w) AM_RANGE(0x1b, 0x1b) AM_WRITE(rongrong_blitter_busy_w) AM_RANGE(0x1e, 0x1e) AM_WRITE(rongrong_select_w) - AM_RANGE(0x20, 0x2f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x60, 0x61) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x20, 0x2f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC + AM_RANGE(0x40, 0x40) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x60, 0x61) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -2073,14 +2073,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x0f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x00, 0x0f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC AM_RANGE(0x38, 0x38) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0x58, 0x58) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0x63, 0x63) AM_READ(rongrong_gfxrom_r) // Video Chip AM_RANGE(0x6a, 0x6a) AM_READ_PORT("IN0") AM_RANGE(0x6b, 0x6b) AM_READ_PORT("IN1") AM_RANGE(0x6c, 0x6d) AM_READ(mmpanic_link_r) // Other cabinets? - AM_RANGE(0x7c, 0x7c) AM_DEVREAD(SOUND, "oki", okim6295_r) // Sound + AM_RANGE(0x7c, 0x7c) AM_DEVREAD("oki", okim6295_r) // Sound AM_RANGE(0x94, 0x94) AM_READ_PORT("DSW1") AM_RANGE(0x98, 0x98) AM_READ_PORT("DSW2") AM_RANGE(0x9c, 0x9c) AM_READ_PORT("DSW3") // DSW 1&2 high bits @@ -2088,7 +2088,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x0f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x00, 0x0f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC // Layers 0-3: AM_RANGE(0x20, 0x23) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x24, 0x27) AM_WRITE(ddenlovr_palette_mask_w) @@ -2108,13 +2108,13 @@ static ADDRESS_MAP_START( mmpanic_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x60, 0x61) AM_WRITE(mmpanic_blitter_w) AM_RANGE(0x64, 0x65) AM_WRITE(mmpanic_blitter2_w) - AM_RANGE(0x68, 0x68) AM_DEVWRITE(SOUND, "ay", ddenlovr_select_w) + AM_RANGE(0x68, 0x68) AM_DEVWRITE("ay", ddenlovr_select_w) AM_RANGE(0x69, 0x69) AM_WRITE(mmpanic_lockout_w) AM_RANGE(0x74, 0x74) AM_WRITE(mmpanic_rombank_w) AM_RANGE(0x78, 0x78) AM_WRITE(SMH_NOP) // 0, during RST 08 (irq acknowledge?) - AM_RANGE(0x7c, 0x7c) AM_DEVWRITE(SOUND, "oki", okim6295_w) // Sound + AM_RANGE(0x7c, 0x7c) AM_DEVWRITE("oki", okim6295_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(SMH_NOP) // written just before port 8c @@ -2142,9 +2142,9 @@ 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(SMH_NOP) // 0, during IRQ AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) // almost always 1, sometimes 0 - AM_RANGE(0x08, 0x09) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0x0c, 0x0c) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x0e, 0x0e) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x0e, 0x0e) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END @@ -2245,11 +2245,11 @@ static WRITE8_HANDLER( funkyfig_lockout_w ) } static ADDRESS_MAP_START( funkyfig_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD(SOUND, "oki", okim6295_r) // Sound + AM_RANGE(0x00, 0x00) AM_DEVREAD("oki", okim6295_r) // Sound AM_RANGE(0x04, 0x04) AM_READ(funkyfig_busy_r) AM_RANGE(0x1c, 0x1c) AM_READ(funkyfig_dsw_r) AM_RANGE(0x23, 0x23) AM_READ(rongrong_gfxrom_r) // Video Chip - AM_RANGE(0x40, 0x4f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x40, 0x4f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC AM_RANGE(0x78, 0x78) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0x82, 0x82) AM_READ(funkyfig_coin_r) AM_RANGE(0x83, 0x83) AM_READ(funkyfig_key_r) @@ -2257,12 +2257,12 @@ static ADDRESS_MAP_START( funkyfig_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G ADDRESS_MAP_END static ADDRESS_MAP_START( funkyfig_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "oki", okim6295_w) // Sound + AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki", okim6295_w) // Sound AM_RANGE(0x01, 0x01) AM_WRITE(mmpanic_leds_w) // Leds AM_RANGE(0x02, 0x02) AM_WRITE(mmpanic_soundlatch_w) // AM_RANGE(0x1e, 0x1e) AM_WRITE(funkyfig_rombank_w) AM_RANGE(0x20, 0x21) AM_WRITE(funkyfig_blitter_w) - AM_RANGE(0x40, 0x4f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x40, 0x4f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC // Layers 0-3: AM_RANGE(0x60, 0x63) AM_WRITE(ddenlovr_palette_base_w) @@ -2438,12 +2438,12 @@ static ADDRESS_MAP_START( hanakanz_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_RANGE(0x91, 0x92) AM_READ(hanakanz_keyb_r) AM_RANGE(0x96, 0x96) AM_READ(hanakanz_rand_r) - AM_RANGE(0xc0, 0xc0) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0xe0, 0xef) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0xc0, 0xc0) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0xe0, 0xef) AM_DEVREAD("rtc", msm6242_r) // 6242RTC ADDRESS_MAP_END static ADDRESS_MAP_START( hanakanz_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x2c, 0x2c) AM_DEVWRITE(SOUND, "oki", hanakanz_oki_bank_w) + AM_RANGE(0x2c, 0x2c) AM_DEVWRITE("oki", hanakanz_oki_bank_w) AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w) AM_RANGE(0x30, 0x30) AM_WRITE(hanakanz_rombank_w) AM_RANGE(0x31, 0x31) AM_WRITE(hanakanz_dsw_w) @@ -2451,9 +2451,9 @@ static ADDRESS_MAP_START( hanakanz_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x81, 0x81) AM_WRITE(hanakanz_palette_w) AM_RANGE(0x93, 0x93) AM_WRITE(hanakanz_coincounter_w) AM_RANGE(0x94, 0x94) AM_WRITE(hanakanz_keyb_w) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0xc0, 0xc0) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xe0, 0xef) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xc0, 0xc0) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xe0, 0xef) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC ADDRESS_MAP_END @@ -2464,22 +2464,22 @@ static ADDRESS_MAP_START( hkagerou_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0xb0, 0xb0) AM_READ_PORT("SYSTEM") AM_RANGE(0xb1, 0xb2) AM_READ(hanakanz_keyb_r) AM_RANGE(0xb6, 0xb6) AM_READ(hanakanz_rand_r) - AM_RANGE(0xc0, 0xc0) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0xe0, 0xef) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0xc0, 0xc0) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0xe0, 0xef) AM_DEVREAD("rtc", msm6242_r) // 6242RTC ADDRESS_MAP_END static ADDRESS_MAP_START( hkagerou_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x2c, 0x2c) AM_DEVWRITE(SOUND, "oki", hanakanz_oki_bank_w) + AM_RANGE(0x2c, 0x2c) AM_DEVWRITE("oki", hanakanz_oki_bank_w) AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w) AM_RANGE(0x30, 0x30) AM_WRITE(hanakanz_rombank_w) AM_RANGE(0x31, 0x31) AM_WRITE(hanakanz_dsw_w) AM_RANGE(0x80, 0x80) AM_WRITE(hanakanz_blitter_data_w) AM_RANGE(0x81, 0x81) AM_WRITE(hanakanz_palette_w) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0xb3, 0xb3) AM_WRITE(hanakanz_coincounter_w) AM_RANGE(0xb4, 0xb4) AM_WRITE(hanakanz_keyb_w) - AM_RANGE(0xc0, 0xc0) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xe0, 0xef) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0xc0, 0xc0) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xe0, 0xef) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC ADDRESS_MAP_END @@ -2503,12 +2503,12 @@ static ADDRESS_MAP_START( mjreach1_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x93, 0x93) AM_READ(mjreach1_protection_r ) AM_RANGE(0x94, 0x94) AM_READ_PORT("SYSTEM") AM_RANGE(0x95, 0x96) AM_READ(hanakanz_keyb_r) - AM_RANGE(0xc0, 0xc0) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0xe0, 0xef) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0xc0, 0xc0) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0xe0, 0xef) AM_DEVREAD("rtc", msm6242_r) // 6242RTC ADDRESS_MAP_END static ADDRESS_MAP_START( mjreach1_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x2c, 0x2c) AM_DEVWRITE(SOUND, "oki", hanakanz_oki_bank_w) + AM_RANGE(0x2c, 0x2c) AM_DEVWRITE("oki", hanakanz_oki_bank_w) AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w) AM_RANGE(0x30, 0x30) AM_WRITE(hanakanz_rombank_w) AM_RANGE(0x31, 0x31) AM_WRITE(hanakanz_dsw_w) @@ -2517,9 +2517,9 @@ static ADDRESS_MAP_START( mjreach1_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x90, 0x90) AM_WRITE(hanakanz_keyb_w) AM_RANGE(0x93, 0x93) AM_WRITE(mjreach1_protection_w) AM_RANGE(0x97, 0x97) AM_WRITE(hanakanz_coincounter_w) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0xc0, 0xc0) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xe0, 0xef) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xc0, 0xc0) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xe0, 0xef) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC ADDRESS_MAP_END @@ -2637,8 +2637,8 @@ static ADDRESS_MAP_START( mjchuuka_readport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x62, 0x62) AM_MIRROR(0xff00) AM_READ_PORT("DSW3") AM_RANGE(0x63, 0x63) AM_MIRROR(0xff00) AM_READ_PORT("DSW4") AM_RANGE(0x64, 0x64) AM_MIRROR(0xff00) AM_READ_PORT("DSW5") // DSW 1-4 high bits - AM_RANGE(0x80, 0x80) AM_MIRROR(0xff00) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0xc0, 0xcf) AM_MIRROR(0xff00) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x80, 0x80) AM_MIRROR(0xff00) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0xc0, 0xcf) AM_MIRROR(0xff00) AM_DEVREAD("rtc", msm6242_r) // 6242RTC ADDRESS_MAP_END static ADDRESS_MAP_START( mjchuuka_writeport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O @@ -2647,11 +2647,11 @@ static ADDRESS_MAP_START( mjchuuka_writeport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/ AM_RANGE(0x21, 0x21) AM_MIRROR(0xff00) AM_MASK(0xff00) AM_WRITE(mjchuuka_palette_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0xff00) AM_WRITE(mjchuuka_coincounter_w) AM_RANGE(0x41, 0x41) AM_MIRROR(0xff00) AM_WRITE(hanakanz_keyb_w) - AM_RANGE(0x80, 0x80) AM_MIRROR(0xff00) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xc0, 0xcf) AM_MIRROR(0xff00) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC - AM_RANGE(0xa0, 0xa1) AM_MIRROR(0xff00) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0xe0, 0xe1) AM_MIRROR(0xff00) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x1e, 0x1e) AM_MIRROR(0xff00) AM_DEVWRITE(SOUND, "oki", mjchuuka_oki_bank_w ) + AM_RANGE(0x80, 0x80) AM_MIRROR(0xff00) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xc0, 0xcf) AM_MIRROR(0xff00) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC + AM_RANGE(0xa0, 0xa1) AM_MIRROR(0xff00) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xe0, 0xe1) AM_MIRROR(0xff00) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x1e, 0x1e) AM_MIRROR(0xff00) AM_DEVWRITE("oki", mjchuuka_oki_bank_w ) ADDRESS_MAP_END @@ -2756,9 +2756,9 @@ static ADDRESS_MAP_START( mjmyster_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r) AM_RANGE(0x22, 0x22) AM_READ(mjmyster_coins_r) AM_RANGE(0x23, 0x23) AM_READ(mjmyster_keyb_r) - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0x44, 0x44) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x60, 0x6f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x40, 0x40) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0x44, 0x44) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x60, 0x6f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC AM_RANGE(0x98, 0x98) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0xc2, 0xc2) AM_READ(hanakanz_rand_r) AM_RANGE(0xc3, 0xc3) AM_READ(mjmyster_dsw_r) @@ -2770,11 +2770,11 @@ static ADDRESS_MAP_START( mjmyster_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x1e, 0x1e) AM_WRITE(mmpanic_rombank_w) AM_RANGE(0x20, 0x20) AM_WRITE(mjmyster_select2_w) AM_RANGE(0x21, 0x21) AM_WRITE(mjmyster_coincounter_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x42, 0x43) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0x46, 0x46) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x48, 0x48) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x60, 0x6f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x40, 0x40) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x42, 0x43) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x46, 0x46) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x48, 0x48) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x60, 0x6f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -2935,8 +2935,8 @@ 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(SMH_NOP) - AM_RANGE(0x24, 0x24) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x60, 0x6f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x24, 0x24) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x60, 0x6f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC AM_RANGE(0x42, 0x42) AM_READ(hginga_coins_r) AM_RANGE(0x43, 0x43) AM_READ(hginga_input_r) AM_RANGE(0xb8, 0xb8) AM_READ(unk_r) // ? must be 78 on startup @@ -2946,12 +2946,12 @@ static ADDRESS_MAP_START( hginga_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x00, 0x01) AM_WRITE(hginga_blitter_w) AM_RANGE(0x1c, 0x1c) AM_WRITE(mjmyster_rambank_w) AM_RANGE(0x1e, 0x1e) AM_WRITE(hginga_rombank_w) - AM_RANGE(0x22, 0x23) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0x26, 0x26) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x28, 0x28) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x22, 0x23) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x26, 0x26) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x28, 0x28) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0x40, 0x40) AM_WRITE(hginga_input_w) AM_RANGE(0x41, 0x41) AM_WRITE(hginga_coins_w) - AM_RANGE(0x60, 0x6f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x60, 0x6f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC AM_RANGE(0x80, 0x80) AM_WRITE(hginga_80_w) AM_RANGE(0xa0, 0xa3) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0xa4, 0xa7) AM_WRITE(ddenlovr_palette_mask_w) @@ -3047,18 +3047,18 @@ 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(SMH_NOP) // ? ack on RTC int - AM_RANGE(0x20, 0x2f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x20, 0x2f) AM_DEVREAD("rtc", 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) - AM_RANGE(0x80, 0x80) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0x84, 0x84) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x80, 0x80) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0x84, 0x84) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xb0, 0xb0) AM_READ(hanakanz_rand_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hgokou_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_WRITE(hginga_blitter_w) AM_RANGE(0x1c, 0x1c) AM_WRITE(mjmyster_rambank_w) AM_RANGE(0x1e, 0x1e) AM_WRITE(hginga_rombank_w) - AM_RANGE(0x20, 0x2f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x20, 0x2f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC AM_RANGE(0x40, 0x43) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x44, 0x47) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x48, 0x4b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -3068,10 +3068,10 @@ static ADDRESS_MAP_START( hgokou_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x56, 0x56) AM_WRITE(ddenlovr_layer_enable_w) AM_RANGE(0x60, 0x60) AM_WRITE(hginga_input_w) AM_RANGE(0x61, 0x61) AM_WRITE(hgokou_input_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0x86, 0x86) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x88, 0x88) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x86, 0x86) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x88, 0x88) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END @@ -3147,7 +3147,7 @@ static ADDRESS_MAP_START( hparadis_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r) AM_RANGE(0x1b, 0x1b) AM_READ(rongrong_blitter_busy_r) AM_RANGE(0x1c, 0x1c) AM_READ(hparadis_dsw_r) - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x40, 0x40) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0x98, 0x98) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0xa2, 0xa3) AM_READ(hparadis_input_r) ADDRESS_MAP_END @@ -3155,8 +3155,8 @@ static ADDRESS_MAP_START( hparadis_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x00, 0x01) AM_WRITE(rongrong_blitter_w) AM_RANGE(0x1b, 0x1b) AM_WRITE(rongrong_blitter_busy_w) AM_RANGE(0x1e, 0x1e) AM_WRITE(hparadis_select_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x60, 0x61) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x60, 0x61) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -3193,9 +3193,9 @@ static ADDRESS_MAP_START( mjmywrld_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r) AM_RANGE(0x22, 0x22) AM_READ(mjmywrld_coins_r) AM_RANGE(0x23, 0x23) AM_READ(mjmyster_keyb_r) - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0x44, 0x44) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x60, 0x6f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0x40, 0x40) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0x44, 0x44) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x60, 0x6f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC AM_RANGE(0x98, 0x98) AM_READ(unk_r) // ? must be 78 on startup AM_RANGE(0xc0, 0xc0) AM_READ(hanakanz_rand_r) AM_RANGE(0xe0, 0xe0) AM_READ(mjmyster_dsw_r) @@ -3207,11 +3207,11 @@ static ADDRESS_MAP_START( mjmywrld_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x1e, 0x1e) AM_WRITE(hginga_rombank_w) AM_RANGE(0x20, 0x20) AM_WRITE(mjmyster_select2_w) AM_RANGE(0x21, 0x21) AM_WRITE(mjmyster_coincounter_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0x42, 0x43) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0x46, 0x46) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x48, 0x48) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x60, 0x6f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x40, 0x40) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0x42, 0x43) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x46, 0x46) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x48, 0x48) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x60, 0x6f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w) AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w) AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w) @@ -3237,7 +3237,7 @@ static WRITE16_HANDLER( akamaru_protection1_w ) COMBINE_DATA( &akamaru_protection1 ); // BCD number? bank = (((akamaru_protection1>>4)&0xf)%10) * 10 + ((akamaru_protection1&0xf)%10); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), bank * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), bank * 0x40000); // popmessage("bank $%0x (%d)",akamaru_protection1, bank); } @@ -3280,9 +3280,9 @@ static ADDRESS_MAP_START( akamaru_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe0010c, 0xe0010d) AM_READ(akamaru_e0010d_r) AM_RANGE(0xe00200, 0xe00201) AM_READ(akamaru_dsw_r) // DSW AM_RANGE(0xe00204, 0xe00205) AM_READ(akamaru_blitter_r) // Blitter Busy & IRQ - AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC - AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) - AM_RANGE(0xe00700, 0xe00701) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // Sound + AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8("rtc", msm6242_r, 0x00ff) // 6242RTC + AM_RANGE(0xe00604, 0xe00605) AM_DEVREAD8("ay", ay8910_r, 0x00ff) + AM_RANGE(0xe00700, 0xe00701) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // Sound AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) // RAM ADDRESS_MAP_END @@ -3304,10 +3304,10 @@ static ADDRESS_MAP_START( akamaru_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0xe00403) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0xe00700, 0xe00701) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0xe00400, 0xe00403) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8("rtc", msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0xe00600, 0xe00603) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xe00700, 0xe00701) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -3382,8 +3382,8 @@ static ADDRESS_MAP_START( mjflove_readport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x0082, 0x0082) AM_READ_PORT("SYSTEM") AM_RANGE(0x00da, 0x00da) AM_READ(mjflove_protection_r) AM_MIRROR(0xff00) AM_RANGE(0x0100, 0x0100) AM_READ_PORT("DSW1") - AM_RANGE(0x0280, 0x028f) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC - AM_RANGE(0x0380, 0x0380) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x0280, 0x028f) AM_DEVREAD("rtc", msm6242_r) // 6242RTC + AM_RANGE(0x0380, 0x0380) AM_DEVREAD("oki", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mjflove_writeport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O @@ -3398,13 +3398,13 @@ static ADDRESS_MAP_START( mjflove_writeport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x0040, 0x0041) AM_WRITE(mjflove_blitter_w) AM_MIRROR(0xff00) 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_DEVWRITE(SOUND, "oki", mjflove_okibank_w) + AM_RANGE(0x00fa, 0x00fa) AM_DEVWRITE("oki", mjflove_okibank_w) AM_RANGE(0x0181, 0x0181) AM_WRITE(SMH_NOP) // ? int. enable AM_RANGE(0x0184, 0x0184) AM_WRITE(mjflove_coincounter_w) - AM_RANGE(0x0200, 0x0201) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0x0280, 0x028f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC - AM_RANGE(0x0300, 0x0301) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x0380, 0x0380) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x0200, 0x0201) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0x0280, 0x028f) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC + AM_RANGE(0x0300, 0x0301) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x0380, 0x0380) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END /*************************************************************************** @@ -3434,20 +3434,20 @@ static ADDRESS_MAP_START( jongtei_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GL AM_RANGE(0x41, 0x42) AM_READ(hanakanz_keyb_r) AM_RANGE(0x46, 0x46) AM_READ(hanakanz_rand_r) AM_RANGE(0x63, 0x64) AM_READ(hanakanz_gfxrom_r) - AM_RANGE(0xa0, 0xa0) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0xc0, 0xcf) AM_DEVREAD(MSM6242, "rtc", msm6242_r) // 6242RTC + AM_RANGE(0xa0, 0xa0) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0xc0, 0xcf) AM_DEVREAD("rtc", msm6242_r) // 6242RTC ADDRESS_MAP_END static ADDRESS_MAP_START( jongtei_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x2c, 0x2c) AM_DEVWRITE(SOUND, "oki", jongtei_okibank_w) + AM_RANGE(0x2c, 0x2c) AM_DEVWRITE("oki", jongtei_okibank_w) AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w) AM_RANGE(0x30, 0x30) AM_WRITE(hanakanz_rombank_w) AM_RANGE(0x31, 0x31) AM_WRITE(jongtei_dsw_keyb_w) AM_RANGE(0x43, 0x43) AM_WRITE(hanakanz_coincounter_w) AM_RANGE(0x60, 0x60) AM_WRITE(hanakanz_blitter_data_w) AM_RANGE(0x61, 0x61) AM_WRITE(hanakanz_palette_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym", ym2413_w) - AM_RANGE(0xa0, 0xa0) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xc0, 0xcf) AM_DEVWRITE(MSM6242, "rtc", msm6242_w) // 6242RTC + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym", ym2413_w) + AM_RANGE(0xa0, 0xa0) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xc0, 0xcf) AM_DEVWRITE("rtc", msm6242_w) // 6242RTC ADDRESS_MAP_END diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index 492e811eba6..6f2c1c6ccde 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -429,7 +429,7 @@ static WRITE8_HANDLER( ddragon_spriteram_w ) static WRITE8_HANDLER( dd_adpcm_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, (offset & 1) ? "adpcm2" : "adpcm1"); + const device_config *adpcm = devtag_get_device(space->machine, (offset & 1) ? "adpcm2" : "adpcm1"); int chip = (strcmp(adpcm->tag, "adpcm1") == 0) ? 0 : 1; switch (offset/2) @@ -586,7 +586,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) AM_RANGE(0x1800, 0x1800) AM_READ(dd_adpcm_status_r) - AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE(SOUND, "fm", ym2151_r, ym2151_w) + AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("fm", ym2151_r, ym2151_w) AM_RANGE(0x3800, 0x3807) AM_WRITE(dd_adpcm_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -595,8 +595,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dd2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "fm", ym2151_r, ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("fm", ym2151_r, ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index a0b73fa7eb1..79714765d94 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -295,32 +295,32 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) - AM_RANGE(0xc800, 0xc801) AM_DEVREAD(SOUND, "ym2151", ym2151_r) - AM_RANGE(0xd800, 0xd800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xc800, 0xc801) AM_DEVREAD("ym2151", ym2151_r) + AM_RANGE(0xd800, 0xd800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ym2151", ym2151_w) - AM_RANGE(0xd800, 0xd800) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ym2151", ym2151_w) + AM_RANGE(0xd800, 0xd800) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("oki", oki_bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x8801, 0x8801) AM_DEVREAD(SOUND, "ym2151", ym2151_status_port_r) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x8801, 0x8801) AM_DEVREAD("ym2151", ym2151_status_port_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVWRITE(SOUND, "ym2151", ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVWRITE("ym2151", ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index 74c40de399e..c059ad387ce 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -118,9 +118,9 @@ static WRITE8_DEVICE_HANDLER( ddrible_vlm5030_ctrl_w ) /* b2 : SSG-C rc filter enable */ /* b1 : SSG-B rc filter enable */ /* b0 : SSG-A rc filter enable */ - filter_rc_set_RC(devtag_get_device(device->machine, SOUND, "filter3"),FLT_RC_LOWPASS, 1000,2200,1000,data & 0x04 ? CAP_N(150) : 0); /* YM2203-SSG-C */ - filter_rc_set_RC(devtag_get_device(device->machine, SOUND, "filter2"),FLT_RC_LOWPASS, 1000,2200,1000,data & 0x02 ? CAP_N(150) : 0); /* YM2203-SSG-B */ - filter_rc_set_RC(devtag_get_device(device->machine, SOUND, "filter1"),FLT_RC_LOWPASS, 1000,2200,1000,data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */ + filter_rc_set_RC(devtag_get_device(device->machine, "filter3"),FLT_RC_LOWPASS, 1000,2200,1000,data & 0x04 ? CAP_N(150) : 0); /* YM2203-SSG-C */ + filter_rc_set_RC(devtag_get_device(device->machine, "filter2"),FLT_RC_LOWPASS, 1000,2200,1000,data & 0x02 ? CAP_N(150) : 0); /* YM2203-SSG-B */ + filter_rc_set_RC(devtag_get_device(device->machine, "filter1"),FLT_RC_LOWPASS, 1000,2200,1000,data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */ } @@ -169,14 +169,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) /* shared RAM with CPU #1 */ - AM_RANGE(0x1000, 0x1001) AM_DEVREAD(SOUND, "ym", ym2203_r) /* YM2203 */ + AM_RANGE(0x1000, 0x1001) AM_DEVREAD("ym", ym2203_r) /* YM2203 */ 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(SMH_RAM) AM_BASE(&ddrible_snd_sharedram) /* shared RAM with CPU #1 */ - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym", ym2203_w) /* YM2203 */ - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* Speech data */ + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym", ym2203_w) /* YM2203 */ + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("vlm", vlm5030_data_w) /* Speech data */ AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END @@ -318,8 +318,8 @@ static const ym2203_interface ym2203_config = AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "vlm", ddrible_vlm5030_busy_r), - DEVCB_DEVICE_HANDLER(SOUND, "vlm", ddrible_vlm5030_ctrl_w), + DEVCB_DEVICE_HANDLER("vlm", ddrible_vlm5030_busy_r), + DEVCB_DEVICE_HANDLER("vlm", ddrible_vlm5030_ctrl_w), DEVCB_NULL }, NULL diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 7381d9d7f59..cb4c72a86c9 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -338,15 +338,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dec0_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x05ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x3800, 0x3800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x3800, 0x3800) AM_DEVREAD("oki", okim6295_r) 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(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) - AM_RANGE(0x3800, 0x3800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w) + AM_RANGE(0x3800, 0x3800) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -354,32 +354,32 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slyspy_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(SMH_NOP) /* Protection counter */ - AM_RANGE(0x0e0000, 0x0e0001) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x0e0000, 0x0e0001) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0x0f0000, 0x0f0001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x090000, 0x090001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) - AM_RANGE(0x0b0000, 0x0b0001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x0e0000, 0x0e0001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x090000, 0x090001) AM_DEVWRITE("ym2", ym3812_w) + AM_RANGE(0x0b0000, 0x0b0001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x0e0000, 0x0e0001) AM_DEVWRITE("oki", okim6295_w) 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(SMH_ROM) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0x138000, 0x138001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x108000, 0x108001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) - AM_RANGE(0x118000, 0x118001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x108000, 0x108001) AM_DEVWRITE("ym2", ym3812_w) + AM_RANGE(0x118000, 0x118001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki", okim6295_w) 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 d774d49bbb2..2af00d6aac2 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -925,16 +925,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dec8_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym2", ym3812_w) 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(SMH_RAM) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ym2", ym3526_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym2", ym3526_w) AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -947,8 +947,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ym3526_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3526_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3526_w) AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -956,15 +956,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x3400, 0x3400) AM_DEVREAD(SOUND, "msm", csilver_adpcm_reset_r) /* ? not sure */ + AM_RANGE(0x3400, 0x3400) AM_DEVREAD("msm", csilver_adpcm_reset_r) /* ? not sure */ 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(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3526_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3526_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(SMH_ROM) diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index c7c9430d062..58f4a4ed335 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -152,7 +152,7 @@ static WRITE32_HANDLER(hvysmsh_eeprom_w) { if (ACCESSING_BITS_0_7) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), 0x40000 * (data & 0x7) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), 0x40000 * (data & 0x7) ); eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); eeprom_write_bit(data & 0x10); @@ -200,9 +200,9 @@ static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 ) 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(SMH_NOP) // IRQ ack? - AM_RANGE(0x12000c, 0x12000f) AM_DEVWRITE(SOUND, "oki1", hvysmsh_oki_0_bank_w) - AM_RANGE(0x140000, 0x140003) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x000000ff) - AM_RANGE(0x160000, 0x160003) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x12000c, 0x12000f) AM_DEVWRITE("oki1", hvysmsh_oki_0_bank_w) + AM_RANGE(0x140000, 0x140003) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x160000, 0x160003) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x000000ff) AM_RANGE(0x180000, 0x18001f) AM_READWRITE( wcvol95_pf12_control_r, wcvol95_pf12_control_w ) AM_RANGE(0x190000, 0x191fff) AM_READWRITE( wcvol95_pf1_data_r, wcvol95_pf1_data_w ) AM_RANGE(0x194000, 0x195fff) AM_READWRITE( wcvol95_pf2_data_r, wcvol95_pf2_data_w ) @@ -226,7 +226,7 @@ static ADDRESS_MAP_START( wcvol95_map, ADDRESS_SPACE_PROGRAM, 32 ) 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(SMH_RAM) AM_WRITE(wcvol95_nonbuffered_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x1a0000, 0x1a0007) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0x000000ff) + AM_RANGE(0x1a0000, 0x1a0007) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x000000ff) ADDRESS_MAP_END diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index d8ad65ac2f7..0d981013212 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -823,7 +823,7 @@ static ADDRESS_MAP_START( dragngun_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x300000, 0x3fffff) AM_READ(SMH_ROM) - AM_RANGE(0x400000, 0x400003) AM_DEVREAD8(SOUND, "oki3", okim6295_r, 0x000000ff) + AM_RANGE(0x400000, 0x400003) AM_DEVREAD8("oki3", okim6295_r, 0x000000ff) AM_RANGE(0x420000, 0x420003) AM_READ(dragngun_eeprom_r) AM_RANGE(0x438000, 0x438003) AM_READ(dragngun_lightgun_r) AM_RANGE(0x440000, 0x440003) AM_READ(dragngun_service_r) @@ -863,7 +863,7 @@ static ADDRESS_MAP_START( dragngun_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x300000, 0x3fffff) AM_WRITE(SMH_ROM) - AM_RANGE(0x400000, 0x400003) AM_DEVWRITE8(SOUND, "oki3", okim6295_w, 0x000000ff) + AM_RANGE(0x400000, 0x400003) AM_DEVWRITE8("oki3", okim6295_w, 0x000000ff) 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) @@ -903,7 +903,7 @@ static ADDRESS_MAP_START( lockload_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x300000, 0x3fffff) AM_READ(SMH_ROM) - AM_RANGE(0x400000, 0x400003) AM_DEVREAD8(SOUND, "oki3", okim6295_r, 0x000000ff) + AM_RANGE(0x400000, 0x400003) AM_DEVREAD8("oki3", okim6295_r, 0x000000ff) AM_RANGE(0x420000, 0x420003) AM_READ(dragngun_eeprom_r) // AM_RANGE(0x438000, 0x438003) AM_READ(dragngun_lightgun_r) AM_RANGE(0x440000, 0x440003) AM_READ(dragngun_service_r) @@ -946,7 +946,7 @@ static ADDRESS_MAP_START( lockload_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x230000, 0x230003) AM_WRITE(dragngun_spriteram_dma_w) AM_RANGE(0x300000, 0x3fffff) AM_WRITE(SMH_ROM) - AM_RANGE(0x400000, 0x400003) AM_DEVWRITE8(SOUND, "oki3", okim6295_w, 0x000000ff) + AM_RANGE(0x400000, 0x400003) AM_DEVWRITE8("oki3", okim6295_w, 0x000000ff) 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) @@ -1112,7 +1112,7 @@ static WRITE8_HANDLER(deco32_bsmt_reset_w) UINT8 diff = data ^ bsmt_reset; bsmt_reset = data; if ((diff & 0x80) && !(data & 0x80)) - devtag_reset(space->machine, SOUND, "bsmt"); + devtag_reset(space->machine, "bsmt"); } static WRITE8_HANDLER(deco32_bsmt0_w) @@ -1133,18 +1133,18 @@ static READ8_HANDLER(deco32_bsmt_status_r) static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) @@ -1161,7 +1161,7 @@ static ADDRESS_MAP_START( sound_writemem_tattass, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "bsmt", deco32_bsmt1_w) + AM_RANGE(0xa000, 0xa0ff) AM_DEVWRITE("bsmt", deco32_bsmt1_w) AM_RANGE(0x2000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -1176,9 +1176,9 @@ static READ8_HANDLER(latch_r) static ADDRESS_MAP_START( nslasher_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xb000, 0xb000) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xb000, 0xb000) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0xd000, 0xd000) AM_READ(latch_r) ADDRESS_MAP_END @@ -1782,8 +1782,8 @@ static void sound_irq_nslasher(const device_config *device, int state) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki1"), ((data >> 0)& 1) * 0x40000); - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki2"), ((data >> 1)& 1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki1"), ((data >> 0)& 1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki2"), ((data >> 1)& 1) * 0x40000); } static const ym2151_interface ym2151_config = diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index d5fa61efa09..f6b904ad8f3 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -278,7 +278,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x0300000, 0x0307fff) AM_READ(SMH_RAM) AM_MIRROR(0xff000000) AM_RANGE(0x0400000, 0x0400003) AM_READ_PORT("INPUTS") AM_MIRROR(0xff000000) AM_RANGE(0x0440000, 0x044001f) AM_READ(test3_r) AM_MIRROR(0xff000000) - AM_RANGE(0x0600004, 0x0600007) AM_DEVREAD8(SOUND, "ymz", ymz280b_r, 0xff000000) AM_MIRROR(0xff000000) + AM_RANGE(0x0600004, 0x0600007) AM_DEVREAD8("ymz", ymz280b_r, 0xff000000) AM_MIRROR(0xff000000) AM_RANGE(0x070f000, 0x070ffff) AM_READ(stadhr96_prot_146_r) AM_MIRROR(0xff000000) ADDRESS_MAP_END @@ -292,7 +292,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x0300000, 0x0307fff) AM_WRITE(avengrs_palette_w) AM_BASE(&paletteram32) AM_MIRROR(0xff000000) AM_RANGE(0x044001c, 0x044001f) AM_WRITE(SMH_NOP) AM_MIRROR(0xff000000) AM_RANGE(0x0500000, 0x0500003) AM_WRITE(avengrs_eprom_w) AM_MIRROR(0xff000000) - AM_RANGE(0x0600000, 0x0600007) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0xff000000) AM_MIRROR(0xff000000) + AM_RANGE(0x0600000, 0x0600007) AM_DEVWRITE8("ymz", ymz280b_w, 0xff000000) AM_MIRROR(0xff000000) // AM_RANGE(0x070f000, 0x070ffff) AM_READ(stadhr96_prot_146_w) AM_BASE(&deco32_prot_ram) ADDRESS_MAP_END diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index 36b544aa1e3..7b4b63febc0 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -138,10 +138,10 @@ static ADDRESS_MAP_START( decocass_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x17ff) AM_READWRITE(decocass_sound_nmi_enable_r, decocass_sound_nmi_enable_w) AM_RANGE(0x1800, 0x1fff) AM_READWRITE(decocass_sound_data_ack_reset_r, decocass_sound_data_ack_reset_w) - AM_RANGE(0x2000, 0x2fff) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x4000, 0x4fff) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6fff) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x8000, 0x8fff) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x2000, 0x2fff) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x4000, 0x4fff) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6fff) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x8000, 0x8fff) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0xa000, 0xafff) AM_READ(decocass_sound_command_r) AM_RANGE(0xc000, 0xcfff) AM_WRITE(decocass_sound_data_w) AM_RANGE(0xf800, 0xffff) AM_ROM diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index c03835912fc..010fcd3a982 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -75,7 +75,7 @@ static WRITE16_DEVICE_HANDLER( deniam16c_oki_rom_bank_w ) static MACHINE_RESET( deniam ) { /* logicpr2 does not reset the bank base on startup */ - okim6295_set_bank_base(devtag_get_device(machine, SOUND, "oki"),0x00000); + okim6295_set_bank_base(devtag_get_device(machine, "oki"),0x00000); } @@ -117,9 +117,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x01, 0x01) AM_READ(soundlatch_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0x05, 0x05) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "oki", deniam16b_oki_rom_bank_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x05, 0x05) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE("oki", deniam16b_oki_rom_bank_w) ADDRESS_MAP_END /* identical to 16b, but handles sound directly */ @@ -127,7 +127,7 @@ static ADDRESS_MAP_START( deniam16c_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0xc40000, 0xc40001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0xc40002, 0xc40003) AM_READ(deniam_coinctrl_r) AM_RANGE(0xc44000, 0xc44001) AM_READ_PORT("SYSTEM") AM_RANGE(0xc44002, 0xc44003) AM_READ_PORT("P1") @@ -143,11 +143,11 @@ static ADDRESS_MAP_START( deniam16c_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x410000, 0x410fff) AM_WRITE(deniam_textram_w) AM_BASE(&deniam_textram) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0xc40000, 0xc40001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xc40002, 0xc40003) AM_WRITE(deniam_coinctrl_w) AM_RANGE(0xc40004, 0xc40005) AM_WRITE(SMH_NOP) /* irq ack? */ - AM_RANGE(0xc40006, 0xc40007) AM_DEVWRITE(SOUND, "oki", deniam16c_oki_rom_bank_w) - AM_RANGE(0xc40008, 0xc4000b) AM_DEVWRITE8(SOUND, "ym", ym3812_w, 0xff00) + AM_RANGE(0xc40006, 0xc40007) AM_DEVWRITE("oki", deniam16c_oki_rom_bank_w) + AM_RANGE(0xc40008, 0xc4000b) AM_DEVWRITE8("ym", ym3812_w, 0xff00) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 1ddab143908..204eaae3dcb 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -35,8 +35,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki", okim6295_r) 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(SMH_BANK8) @@ -45,8 +45,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki", okim6295_w) 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) diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 7a252ab4fec..150d40394f5 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -342,7 +342,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xec00, 0xec01) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ym", ym3812_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 303b7730119..22638278c22 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -103,15 +103,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "oki", okibank_w) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", okibank_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index d28da245b43..d5877fd0ec2 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -785,10 +785,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_port_am, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(cpu2_bankswitch_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) - AM_RANGE(0x06, 0x06) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x07, 0x07) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x06, 0x06) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x07, 0x07) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 8a0cb1ddfc3..bb0795f1528 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -174,9 +174,9 @@ static READ16_HANDLER( dual539_r ) UINT16 ret = 0; if (ACCESSING_BITS_0_7) - ret |= k054539_r(devtag_get_device(space->machine, SOUND, "konami2"), offset); + ret |= k054539_r(devtag_get_device(space->machine, "konami2"), offset); if (ACCESSING_BITS_8_15) - ret |= k054539_r(devtag_get_device(space->machine, SOUND, "konami1"), offset)<<8; + ret |= k054539_r(devtag_get_device(space->machine, "konami1"), offset)<<8; return ret; } @@ -184,9 +184,9 @@ static READ16_HANDLER( dual539_r ) static WRITE16_HANDLER( dual539_w ) { if (ACCESSING_BITS_0_7) - k054539_w(devtag_get_device(space->machine, SOUND, "konami2"), offset, data); + k054539_w(devtag_get_device(space->machine, "konami2"), offset, data); if (ACCESSING_BITS_8_15) - k054539_w(devtag_get_device(space->machine, SOUND, "konami1"), offset, data>>8); + k054539_w(devtag_get_device(space->machine, "konami1"), offset, data>>8); } @@ -480,11 +480,11 @@ static ADDRESS_MAP_START( memory_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x803800, 0x803fff) AM_READ(obj_rom_r) // OBJECT ROM readthrough (for POST) AM_RANGE(0xc00000, 0xc01fff) AM_READWRITE(K056832_ram_long_r, K056832_ram_long_w) // VIDEO RAM (tilemap) (beatmania) AM_RANGE(0xc02000, 0xc02047) AM_WRITE(unknownc02000_w) // ?? - AM_RANGE(0xd00000, 0xd0000f) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_std_r, ide_std_w) // IDE control regs (hiphopmania) - AM_RANGE(0xd4000c, 0xd4000f) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_alt_r, ide_alt_w) // IDE status control reg (hiphopmania) + AM_RANGE(0xd00000, 0xd0000f) AM_DEVREADWRITE("ide", ide_std_r, ide_std_w) // IDE control regs (hiphopmania) + AM_RANGE(0xd4000c, 0xd4000f) AM_DEVREADWRITE("ide", ide_alt_r, ide_alt_w) // IDE status control reg (hiphopmania) AM_RANGE(0xe00000, 0xe01fff) AM_READWRITE(K056832_ram_long_r, K056832_ram_long_w) // VIDEO RAM (tilemap) (hiphopmania) - AM_RANGE(0xf00000, 0xf0000f) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_std_r, ide_std_w) // IDE control regs (beatmania) - AM_RANGE(0xf4000c, 0xf4000f) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_alt_r, ide_alt_w) // IDE status control reg (beatmania) + AM_RANGE(0xf00000, 0xf0000f) AM_DEVREADWRITE("ide", ide_std_r, ide_std_w) // IDE control regs (beatmania) + AM_RANGE(0xf4000c, 0xf4000f) AM_DEVREADWRITE("ide", ide_alt_r, ide_alt_w) // IDE status control reg (beatmania) ADDRESS_MAP_END @@ -991,7 +991,7 @@ static STATE_POSTLOAD( djmain_postload ) static MACHINE_START( djmain ) { - const device_config *ide = device_list_find_by_tag(machine->config->devicelist, IDE_CONTROLLER, "ide"); + const device_config *ide = devtag_get_device(machine, "ide"); UINT8 *region = memory_region(machine, "shared"); if (ide != NULL && ide_master_password != NULL) @@ -1016,7 +1016,7 @@ static MACHINE_RESET( djmain ) sndram_set_bank(machine); /* reset the IDE controller */ - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); /* reset LEDs */ set_led_status(0, 1); diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index c09640dc0e2..4f1651cd3f0 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -567,7 +567,7 @@ static WRITE8_DEVICE_HANDLER( p8257_drq_w ) static READ8_HANDLER( dkong_in2_r ) { /* mcu status (sound feedback) is inverted bit4 from port B (8039) */ - const device_config *devvp2 = devtag_get_device(space->machine, LATCH8, "virtual_p2"); + const device_config *devvp2 = devtag_get_device(space->machine, "virtual_p2"); UINT8 mcustatus = latch8_bit4_q_r(devvp2, 0); UINT8 r; @@ -752,19 +752,19 @@ static ADDRESS_MAP_START( dkong_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) - AM_RANGE(0x7800, 0x780f) AM_DEVREADWRITE(DMA8257, "dma8257", dma8257_r, dma8257_w) /* P8257 control registers */ + AM_RANGE(0x7800, 0x780f) AM_DEVREADWRITE("dma8257", dma8257_r, dma8257_w) /* P8257 control registers */ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_LATCH8_WRITE("ls175.3d") /* IN0, sound CPU intf */ AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(radarscp_grid_color_w) /* IN1 */ AM_RANGE(0x7d00, 0x7d00) AM_READ(dkong_in2_r) /* IN2 */ - AM_RANGE(0x7d00, 0x7d07) AM_DEVWRITE(LATCH8, "ls259.6h", latch8_bit0_w) /* Sound signals */ + AM_RANGE(0x7d00, 0x7d07) AM_DEVWRITE("ls259.6h", latch8_bit0_w) /* Sound signals */ AM_RANGE(0x7d80, 0x7d80) AM_READ_PORT("DSW0") AM_WRITE(dkong_audio_irq_w) /* DSW0 */ AM_RANGE(0x7d81, 0x7d81) AM_WRITE(radarscp_grid_enable_w) AM_RANGE(0x7d82, 0x7d82) AM_WRITE(dkong_flipscreen_w) AM_RANGE(0x7d83, 0x7d83) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */ AM_RANGE(0x7d84, 0x7d84) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x7d85, 0x7d85) AM_DEVWRITE(DMA8257, "dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ + AM_RANGE(0x7d85, 0x7d85) AM_DEVWRITE("dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ AM_RANGE(0x7d86, 0x7d87) AM_WRITE(dkong_palettebank_w) ADDRESS_MAP_END @@ -776,23 +776,23 @@ static ADDRESS_MAP_START( dkongjr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) - AM_RANGE(0x7800, 0x780f) AM_DEVREADWRITE(DMA8257, "dma8257", dma8257_r, dma8257_w) /* P8257 control registers */ + AM_RANGE(0x7800, 0x780f) AM_DEVREADWRITE("dma8257", dma8257_r, dma8257_w) /* P8257 control registers */ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_LATCH8_WRITE("ls174.3d") /* IN0, sound interface */ AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(dkongjr_gfxbank_w) - AM_RANGE(0x7c80, 0x7c87) AM_DEVWRITE(LATCH8, "ls259.4h", latch8_bit0_w) /* latch for sound and signals above */ + AM_RANGE(0x7c80, 0x7c87) AM_DEVWRITE("ls259.4h", latch8_bit0_w) /* latch for sound and signals above */ AM_RANGE(0x7d00, 0x7d00) AM_READ(dkongjr_in2_r) /* IN2 */ - AM_RANGE(0x7d00, 0x7d07) AM_DEVWRITE(LATCH8, "ls259.6h",latch8_bit0_w) /* Sound addrs */ + AM_RANGE(0x7d00, 0x7d07) AM_DEVWRITE("ls259.6h",latch8_bit0_w) /* Sound addrs */ AM_RANGE(0x7d80, 0x7d80) AM_READ_PORT("DSW0") AM_WRITE(dkong_audio_irq_w) /* DSW0 */ AM_RANGE(0x7d82, 0x7d82) AM_WRITE(dkong_flipscreen_w) AM_RANGE(0x7d83, 0x7d83) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */ AM_RANGE(0x7d84, 0x7d84) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x7d85, 0x7d85) AM_DEVWRITE(DMA8257, "dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ + AM_RANGE(0x7d85, 0x7d85) AM_DEVWRITE("dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ AM_RANGE(0x7d86, 0x7d87) AM_WRITE(dkong_palettebank_w) - AM_RANGE(0x7d80, 0x7d87) AM_DEVWRITE(LATCH8, "ls259.5h", latch8_bit0_w) /* latch for sound and signals above*/ + AM_RANGE(0x7d80, 0x7d87) AM_DEVWRITE("ls259.5h", latch8_bit0_w) /* latch for sound and signals above*/ AM_RANGE(0x8000, 0x9fff) AM_ROM /* bootleg DKjr only */ AM_RANGE(0xb000, 0xbfff) AM_ROM /* pestplce only */ @@ -816,14 +816,14 @@ static ADDRESS_MAP_START( dkong3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7e82, 0x7e82) AM_WRITE(dkong_flipscreen_w) AM_RANGE(0x7e83, 0x7e83) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */ AM_RANGE(0x7e84, 0x7e84) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE(Z80DMA, "z80dma", z80dma_rdy_w) /* ==> DMA Chip */ + AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE("z80dma", z80dma_rdy_w) /* ==> DMA Chip */ AM_RANGE(0x7e86, 0x7e87) AM_WRITE(dkong_palettebank_w) AM_RANGE(0x8000, 0x9fff) AM_ROM /* DK3 and bootleg DKjr only */ ADDRESS_MAP_END static ADDRESS_MAP_START( dkong3_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(Z80DMA, "z80dma", z80dma_r, z80dma_w) /* dma controller */ + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("z80dma", z80dma_r, z80dma_w) /* dma controller */ ADDRESS_MAP_END /* Epos conversions */ @@ -839,21 +839,21 @@ static ADDRESS_MAP_START( s2650_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* 0x7000 */ - AM_RANGE(0x1400, 0x1400) AM_READ_PORT("IN0") AM_DEVWRITE(LATCH8, "ls175.3d", latch8_w) + AM_RANGE(0x1400, 0x1400) AM_READ_PORT("IN0") AM_DEVWRITE("ls175.3d", latch8_w) AM_RANGE(0x1480, 0x1480) AM_READ_PORT("IN1") AM_RANGE(0x1500, 0x1500) AM_READ(dkong_in2_r) /* IN2 */ - AM_RANGE(0x1500, 0x1507) AM_DEVWRITE(LATCH8, "ls259.6h", latch8_bit0_w) /* Sound signals */ + AM_RANGE(0x1500, 0x1507) AM_DEVWRITE("ls259.6h", latch8_bit0_w) /* Sound signals */ AM_RANGE(0x1580, 0x1580) AM_READ_PORT("DSW0") AM_WRITE(dkong_audio_irq_w) /* DSW0 */ AM_RANGE(0x1582, 0x1582) AM_WRITE(dkong_flipscreen_w) AM_RANGE(0x1583, 0x1583) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */ AM_RANGE(0x1584, 0x1584) AM_NOP /* Possibly still interupt enable */ - AM_RANGE(0x1585, 0x1585) AM_DEVWRITE(DMA8257, "dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ + AM_RANGE(0x1585, 0x1585) AM_DEVWRITE("dma8257", 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_RAM_WRITE(dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) /* 0x7400 */ AM_RANGE(0x1C00, 0x1f7f) AM_RAM /* 0x6000 */ - AM_RANGE(0x1f80, 0x1f8f) AM_DEVREADWRITE(DMA8257, "dma8257", dma8257_r, dma8257_w) /* P8257 control registers */ + AM_RANGE(0x1f80, 0x1f8f) AM_DEVREADWRITE("dma8257", dma8257_r, dma8257_w) /* P8257 control registers */ /* 0x6800 not remapped */ AM_RANGE(0x2000, 0x2fff) AM_ROM AM_RANGE(0x3000, 0x3fff) AM_READWRITE(s2650_mirror_r, s2650_mirror_w) @@ -1713,7 +1713,7 @@ static MACHINE_DRIVER_START( s2650 ) MDRV_CPU_IO_MAP(s2650_io_map, 0) MDRV_CPU_VBLANK_INT("screen", s2650_interrupt) - MDRV_DEVICE_MODIFY("dma8257", DMA8257) + MDRV_DEVICE_MODIFY("dma8257") MDRV_DEVICE_CONFIG(hb_dma) MDRV_MACHINE_START(s2650) diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 2201d4df512..7f2810e5478 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -127,8 +127,8 @@ static const z80sio_interface sio_intf = static const z80_daisy_chain dleuro_daisy_chain[] = { - { Z80SIO, "sio" }, - { Z80CTC, "ctc" }, + { "sio" }, + { "ctc" }, { NULL } }; @@ -184,7 +184,7 @@ static VIDEO_UPDATE( dleuro ) static MACHINE_START( dlair ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } @@ -209,10 +209,10 @@ static MACHINE_RESET( dlair ) static INTERRUPT_GEN( vblank_callback ) { /* also update the speaker on the European version */ - const device_config *beep = devtag_get_device(device->machine, SOUND, "beep"); + const device_config *beep = devtag_get_device(device->machine, "beep"); if (beep != NULL) { - const device_config *ctc = devtag_get_device(device->machine, Z80CTC, "ctc"); + const device_config *ctc = devtag_get_device(device->machine, "ctc"); beep_set_state(beep, 1); beep_set_frequency(beep, ATTOSECONDS_TO_HZ(z80ctc_getperiod(ctc, 0).attoseconds)); } @@ -376,13 +376,13 @@ static WRITE8_DEVICE_HANDLER( sio_w ) static ADDRESS_MAP_START( dlus_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa7ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xc008, 0xc008) AM_MIRROR(0x1fc7) AM_READ_PORT("CONTROLS") AM_RANGE(0xc010, 0xc010) AM_MIRROR(0x1fc7) AM_READ_PORT("SERVICE") AM_RANGE(0xc020, 0xc020) AM_MIRROR(0x1fc7) AM_READ(laserdisc_r) - AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fc7) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fc7) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0xe008, 0xe008) AM_MIRROR(0x1fc7) AM_WRITE(misc_w) - AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1fc7) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1fc7) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0xe020, 0xe020) AM_MIRROR(0x1fc7) AM_WRITE(laserdisc_w) AM_RANGE(0xe030, 0xe037) AM_MIRROR(0x1fc0) AM_WRITE(led_den2_w) AM_RANGE(0xe038, 0xe03f) AM_MIRROR(0x1fc0) AM_WRITE(led_den1_w) @@ -419,8 +419,8 @@ ADDRESS_MAP_END /* complete memory map derived from schematics */ static ADDRESS_MAP_START( dleuro_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_MIRROR(0x7c) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) - AM_RANGE(0x80, 0x83) AM_MIRROR(0x7c) AM_DEVREADWRITE(Z80SIO, "sio", sio_r, sio_w) + AM_RANGE(0x00, 0x03) AM_MIRROR(0x7c) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x80, 0x83) AM_MIRROR(0x7c) AM_DEVREADWRITE("sio", sio_r, sio_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index e147244bbcc..c915dcd2948 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -134,9 +134,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dderby_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1000, 0x1000) AM_RAM //??? - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) - AM_RANGE(0x4001, 0x4001) AM_DEVREAD(SOUND, "ay1", ay8910_r) + AM_RANGE(0x4001, 0x4001) AM_DEVREAD("ay1", ay8910_r) AM_RANGE(0x6000, 0x67ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index 31d00b4cf92..cb68b7588f7 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -233,10 +233,10 @@ static ADDRESS_MAP_START( docastle_map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS") AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM") AM_RANGE(0xc084, 0xc084) AM_READWRITE(docastle_flipscreen_on_r, docastle_flipscreen_on_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xe400, 0xe400) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "sn4", sn76496_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76496_w) ADDRESS_MAP_END static ADDRESS_MAP_START( docastle_map3, ADDRESS_SPACE_PROGRAM, 8 ) @@ -269,10 +269,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dorunrun_map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xa800, 0xa800) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0xac00, 0xac00) AM_DEVWRITE(SOUND, "sn4", sn76496_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xa800, 0xa800) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0xac00, 0xac00) AM_DEVWRITE("sn4", sn76496_w) AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2") AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1") AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS") @@ -293,7 +293,7 @@ static ADDRESS_MAP_START( idsoccer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w) AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_RAM_WRITE(docastle_videoram_w) AM_BASE(&videoram) AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_RAM_WRITE(docastle_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE(SOUND, "msm", idsoccer_adpcm_status_r, idsoccer_adpcm_w) + AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE("msm", idsoccer_adpcm_status_r, idsoccer_adpcm_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w) ADDRESS_MAP_END @@ -308,10 +308,10 @@ static ADDRESS_MAP_START( idsoccer_map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS") AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM") AM_RANGE(0xc084, 0xc084) AM_READ_PORT("JOYS_RIGHT") AM_WRITE(docastle_flipscreen_on_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xe400, 0xe400) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "sn4", sn76496_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76496_w) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index b02a99e10bb..1ec58a80adc 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -55,11 +55,11 @@ static WRITE8_HANDLER( dogfgt_soundcontrol_w ) /* bit 5 goes to 8910 #0 BDIR pin */ if ((last & 0x20) == 0x20 && (data & 0x20) == 0x00) - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay1"), last >> 4, soundlatch); + ay8910_data_address_w(devtag_get_device(space->machine, "ay1"), last >> 4, soundlatch); /* bit 7 goes to 8910 #1 BDIR pin */ if ((last & 0x80) == 0x80 && (data & 0x80) == 0x00) - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay2"), last >> 6, soundlatch); + ay8910_data_address_w(devtag_get_device(space->machine, "ay2"), last >> 6, soundlatch); last = data; } diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 427bf2543d5..703620707a1 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -126,8 +126,8 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xd001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xd001, 0xd001) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xd001, 0xd001) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xd008, 0xd008) AM_WRITE(dominob_d008_w) AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("IN0") AM_RANGE(0xd010, 0xd010) AM_READ_PORT("IN1") AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 9a3e4144b43..687ca06bab6 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -305,45 +305,45 @@ static ADDRESS_MAP_START( lastday_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xf002, 0xf003) AM_DEVREAD(SOUND, "ym1", ym2203_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xf002, 0xf003) AM_DEVREAD("ym1", ym2203_r) ADDRESS_MAP_END static ADDRESS_MAP_START( lastday_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xf002, 0xf003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xf002, 0xf003) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf803) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xf804, 0xf805) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xf802, 0xf803) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xf804, 0xf805) AM_DEVREAD("ym2", ym2203_r) ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf802, 0xf803) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xf804, 0xf805) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xf802, 0xf803) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xf804, 0xf805) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0xf808, 0xf809) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0xf80a, 0xf80a) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xf808, 0xf809) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0xf80a, 0xf80a) AM_DEVREAD("oki", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf808, 0xf809) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0xf80a, 0xf80a) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xf808, 0xf809) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0xf80a, 0xf80a) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index 91e8f7558a4..84de40ce2bd 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -44,7 +44,7 @@ static MACHINE_RESET( dragrace ) static void dragrace_update_misc_flags(const address_space *space) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); /* 0x0900 = set 3SPEED1 0x00000001 * 0x0901 = set 4SPEED1 0x00000002 diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index b8e5809da63..5199a3706f6 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -298,10 +298,10 @@ static ADDRESS_MAP_START( dreamwld_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xc00004, 0xc00007) AM_READ_PORT("c00004") AM_RANGE(0xc0000c, 0xc0000f) AM_WRITE( dreamwld_6295_0_bank_w ) // sfx - AM_RANGE(0xc00018, 0xc0001b) AM_DEVREADWRITE8( SOUND, "oki1", okim6295_r, okim6295_w, 0xff000000 ) // sfx + AM_RANGE(0xc00018, 0xc0001b) AM_DEVREADWRITE8( "oki1", okim6295_r, okim6295_w, 0xff000000 ) // sfx AM_RANGE(0xc0002c, 0xc0002f) AM_WRITE( dreamwld_6295_1_bank_w ) // sfx - AM_RANGE(0xc00028, 0xc0002b) AM_DEVREADWRITE8( SOUND, "oki2", okim6295_r, okim6295_w, 0xff000000 ) // sfx + AM_RANGE(0xc00028, 0xc0002b) AM_DEVREADWRITE8( "oki2", okim6295_r, okim6295_w, 0xff000000 ) // sfx AM_RANGE(0xc00030, 0xc00033) AM_READ(dreamwld_protdata_r) // it reads protection data (irq code) from here and puts it at ffd000 diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index ee6dea2d875..a2362962db2 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -91,8 +91,8 @@ static READ8_HANDLER( drgnmst_snd_command_r ) switch (drgnmst_oki_control & 0x1f) { - case 0x12: data = (okim6295_r(devtag_get_device(space->machine, SOUND, "oki2"), 0) & 0x0f); break; - case 0x16: data = (okim6295_r(devtag_get_device(space->machine, SOUND, "oki1"), 0) & 0x0f); break; + case 0x12: data = (okim6295_r(devtag_get_device(space->machine, "oki2"), 0) & 0x0f); break; + case 0x16: data = (okim6295_r(devtag_get_device(space->machine, "oki1"), 0) & 0x0f); break; case 0x0b: case 0x0f: data = drgnmst_snd_command; break; default: break; @@ -159,12 +159,12 @@ static WRITE8_HANDLER( drgnmst_snd_control_w ) if (oki_new_bank != drgnmst_oki0_bank) { drgnmst_oki0_bank = oki_new_bank; if (drgnmst_oki0_bank) oki_new_bank--; - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), (oki_new_bank * 0x40000)); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), (oki_new_bank * 0x40000)); } oki_new_bank = ((pic16c5x_port0 & 0x3) >> 0) | ((drgnmst_oki_control & 0x20) >> 3); if (oki_new_bank != drgnmst_oki1_bank) { drgnmst_oki1_bank = oki_new_bank; - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), (oki_new_bank * 0x40000)); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), (oki_new_bank * 0x40000)); } switch(drgnmst_oki_control & 0x1f) @@ -172,12 +172,12 @@ static WRITE8_HANDLER( drgnmst_snd_control_w ) case 0x11: // logerror("Writing %02x to OKI1",drgnmst_oki_command); // logerror(", PortC=%02x, Code=%02x, Bank0=%01x, Bank1=%01x\n",drgnmst_oki_control,drgnmst_snd_command,drgnmst_oki0_bank,drgnmst_oki1_bank); - okim6295_w(devtag_get_device(space->machine, SOUND, "oki2"), 0, drgnmst_oki_command); + okim6295_w(devtag_get_device(space->machine, "oki2"), 0, drgnmst_oki_command); break; case 0x15: // logerror("Writing %02x to OKI0",drgnmst_oki_command); // logerror(", PortC=%02x, Code=%02x, Bank0=%01x, Bank1=%01x\n",drgnmst_oki_control,drgnmst_snd_command,drgnmst_oki0_bank,drgnmst_oki1_bank); - okim6295_w(devtag_get_device(space->machine, SOUND, "oki1"), 0, drgnmst_oki_command); + okim6295_w(devtag_get_device(space->machine, "oki1"), 0, drgnmst_oki_command); break; default: break; } diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 64da2bc176b..a5af6074858 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -159,9 +159,9 @@ static WRITE8_DEVICE_HANDLER( shr_w ) static READ8_HANDLER( ioread ) { if (offset & 0x08) - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), offset & 3); else if (offset & 0x10) - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), offset & 3); return 0xff; } @@ -169,9 +169,9 @@ static READ8_HANDLER( ioread ) static WRITE8_HANDLER( iowrite ) { if (offset & 0x08) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset & 3, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), offset & 3, data); else if (offset & 0x10) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), offset & 3, data); else if (offset & 0x40) { dr = ds; diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index 416d8b6f897..57af00951ef 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -69,7 +69,7 @@ static void pcm_w(const device_config *device) static WRITE8_HANDLER( pcm_set_w ) { pcm_adr = ((data & 0x3f) << 9); - pcm_w(devtag_get_device(space->machine, SOUND, "msm")); + pcm_w(devtag_get_device(space->machine, "msm")); } /****************************************************************************/ @@ -90,9 +90,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(pcm_set_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2") AM_WRITE(nmi_enable_w) AM_RANGE(0x05, 0x05) AM_READWRITE(SMH_NOP, SMH_NOP) // unused? / watchdog? diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index b6372c87fba..71c532b7c24 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -141,8 +141,8 @@ static ADDRESS_MAP_START( drtomy_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW2") AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1") AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2") - AM_RANGE(0x70000c, 0x70000d) AM_DEVWRITE(SOUND, "oki", drtomy_okibank_w) /* OKI banking */ - AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) /* OKI 6295*/ + AM_RANGE(0x70000c, 0x70000d) AM_DEVWRITE("oki", drtomy_okibank_w) /* OKI banking */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) /* OKI 6295*/ AM_RANGE(0xffc000, 0xffffff) AM_RAM /* Work RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index b49934f5ead..e9532d8bacf 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -121,11 +121,11 @@ static WRITE8_HANDLER( drw80pkr_io_w ) // ay8910 control port if (p1 == 0xfc && p2 == 0xff && offset == 0x00) - ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay"), 0, data); + ay8910_address_w(devtag_get_device(space->machine, "ay"), 0, data); // ay8910_write_port_0_w if (p1 == 0xfe && p2 == 0xff && offset == 0x00) - ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay"), 0, data); + ay8910_data_w(devtag_get_device(space->machine, "ay"), 0, data); // CRTC Register // R0 = 0x1f(31) Horizontal Total diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index cf64d86d3fb..c9f119a8d4a 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -417,8 +417,8 @@ static ADDRESS_MAP_START( dunhuang_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x001b, 0x001b ) AM_WRITE( dunhuang_block_dest_w ) - AM_RANGE( 0x0081, 0x0081 ) AM_DEVWRITE( SOUND, "ym", ym2413_register_port_w ) - AM_RANGE( 0x0089, 0x0089 ) AM_DEVWRITE( SOUND, "ym", ym2413_data_port_w ) + AM_RANGE( 0x0081, 0x0081 ) AM_DEVWRITE( "ym", ym2413_register_port_w ) + AM_RANGE( 0x0089, 0x0089 ) AM_DEVWRITE( "ym", ym2413_data_port_w ) // AM_RANGE( 0x0082, 0x0082 ) AM_WRITE( dunhuang_82_w ) @@ -431,9 +431,9 @@ static ADDRESS_MAP_START( dunhuang_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x0086, 0x0086 ) AM_WRITE( dunhuang_rombank_w ) AM_RANGE( 0x0087, 0x0087 ) AM_WRITE( dunhuang_layers_w ) - AM_RANGE( 0x0088, 0x0088 ) AM_DEVREAD( SOUND, "ay8910", ay8910_r ) - AM_RANGE( 0x0090, 0x0090 ) AM_DEVWRITE( SOUND, "ay8910", ay8910_data_w ) - AM_RANGE( 0x0098, 0x0098 ) AM_DEVWRITE( SOUND, "ay8910", ay8910_address_w ) + AM_RANGE( 0x0088, 0x0088 ) AM_DEVREAD( "ay8910", ay8910_r ) + AM_RANGE( 0x0090, 0x0090 ) AM_DEVWRITE( "ay8910", ay8910_data_w ) + AM_RANGE( 0x0098, 0x0098 ) AM_DEVWRITE( "ay8910", ay8910_address_w ) ADDRESS_MAP_END diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 188937c6cda..40d2e1970b1 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -365,8 +365,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x20, 0x20) AM_READWRITE(i8275_preg_r, i8275_preg_w) AM_RANGE(0x21, 0x21) AM_READWRITE(i8275_sreg_r, i8275_creg_w) diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index fe482126628..be419c8c507 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -92,7 +92,7 @@ static ADDRESS_MAP_START( dynadice_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_RANGE(0x01, 0x01) AM_WRITE(soundlatch_clear_w) AM_RANGE(0x02, 0x02) AM_WRITE(sound_data_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "ay", sound_control_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("ay", sound_control_w) ADDRESS_MAP_END static INPUT_PORTS_START( dynadice ) diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 51ad4f9cd1e..32d0b3cfe1f 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -347,7 +347,7 @@ static WRITE8_HANDLER( yarunara_palette_w ) case 0x1c: // RTC { - const device_config *rtc = device_list_find_by_tag(space->machine->config->devicelist, MSM6242, "rtc"); + const device_config *rtc = devtag_get_device(space->machine, "rtc"); msm6242_w(rtc, offset, data); } return; @@ -442,7 +442,7 @@ static MACHINE_RESET( adpcm ) { /* start with the MSM5205 reset */ resetkludge = 0; - msm5205_reset_w(devtag_get_device(machine, SOUND, "msm"),1); + msm5205_reset_w(devtag_get_device(machine, "msm"),1); } static WRITE8_HANDLER( yarunara_layer_half_w ) @@ -532,15 +532,15 @@ static ADDRESS_MAP_START( hanamai_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x6c, 0x6c ) AM_WRITE ( dynax_blit_palette01_w ) // Layers Palettes (Low Bits) AM_RANGE( 0x6d, 0x6d ) AM_WRITE ( dynax_blit_palette23_w ) // AM_RANGE( 0x6e, 0x6e ) AM_WRITE ( dynax_blit_backpen_w ) // Background Color - AM_RANGE( 0x70, 0x70 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w) // MSM5205 reset + AM_RANGE( 0x70, 0x70 ) AM_DEVWRITE ( "msm", adpcm_reset_w) // MSM5205 reset AM_RANGE( 0x71, 0x71 ) AM_WRITE ( dynax_flipscreen_w ) // Flip Screen AM_RANGE( 0x72, 0x72 ) AM_WRITE ( dynax_coincounter_0_w ) // Coin Counters AM_RANGE( 0x73, 0x73 ) AM_WRITE ( dynax_coincounter_1_w ) // AM_RANGE( 0x74, 0x74 ) AM_WRITE ( dynax_blitter_ack_w ) // Blitter IRQ Ack AM_RANGE( 0x76, 0x76 ) AM_WRITE ( dynax_blit_palbank_w ) // Layers Palettes (High Bit) AM_RANGE( 0x77, 0x77 ) AM_WRITE ( hanamai_layer_half_w ) // half of the interleaved layer to write to - AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w ) // 2 x DSW - AM_RANGE( 0x7a, 0x7b ) AM_DEVWRITE ( SOUND, "ay", ay8910_address_data_w ) // AY8910 + AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) // 2 x DSW + AM_RANGE( 0x7a, 0x7b ) AM_DEVWRITE ( "ay", ay8910_address_data_w ) // AY8910 // 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 @@ -559,12 +559,12 @@ static ADDRESS_MAP_START( hnoridur_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x24, 0x24 ) AM_READ_PORT ( "DSW1" ) // DSW2 AM_RANGE( 0x25, 0x25 ) AM_READ_PORT ( "DSW3" ) // DSW4 AM_RANGE( 0x26, 0x26 ) AM_READ_PORT ( "DSW2" ) // DSW3 - AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset + AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x32, 0x32 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) // - AM_RANGE( 0x36, 0x36 ) AM_DEVREAD ( SOUND, "ay", ay8910_r ) // AY8910, DSW1 - AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( SOUND, "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( SOUND, "ay", ay8910_address_w ) // + AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x36, 0x36 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910, DSW1 + AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 + AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_blit_dest_w ) // Destination Layer AM_RANGE( 0x42, 0x42 ) AM_WRITE ( dynax_blit_palette01_w ) // Layers Palettes @@ -685,11 +685,11 @@ static ADDRESS_MAP_START( yarunara_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x00, 0x01 ) AM_WRITE ( yarunara_input_w ) // Controls AM_RANGE( 0x02, 0x03 ) AM_READ ( yarunara_input_r ) // AM_RANGE( 0x11, 0x17 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter - AM_RANGE( 0x20, 0x20 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset + AM_RANGE( 0x20, 0x20 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x22, 0x22 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x24, 0x25 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) // - AM_RANGE( 0x28, 0x28 ) AM_DEVWRITE ( SOUND, "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x2a, 0x2a ) AM_DEVWRITE ( SOUND, "ay", ay8910_address_w ) // + AM_RANGE( 0x24, 0x25 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x28, 0x28 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 + AM_RANGE( 0x2a, 0x2a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // AM_RANGE( 0x48, 0x48 ) AM_WRITE ( dynax_extra_scrollx_w ) // screen scroll X AM_RANGE( 0x49, 0x49 ) AM_WRITE ( dynax_extra_scrolly_w ) // screen scroll Y AM_RANGE( 0x4a, 0x4a ) AM_WRITE ( yarunara_rombank_w ) // BANK ROM Select @@ -724,11 +724,11 @@ static ADDRESS_MAP_START( mcnpshnt_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x23, 0x23 ) AM_READ ( hanamai_keyboard_0_r ) // P1 AM_RANGE( 0x24, 0x24 ) AM_READ_PORT ( "DSW0" ) // DSW2 AM_RANGE( 0x26, 0x26 ) AM_READ_PORT ( "DSW1" ) // DSW3 - AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset + AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x32, 0x32 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) // - AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( SOUND, "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( SOUND, "ay", ay8910_address_w ) // + AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 + AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_blit_dest_w ) // Destination Layer AM_RANGE( 0x42, 0x42 ) AM_WRITE ( dynax_blit_palette01_w ) // Layers Palettes @@ -754,7 +754,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sprtmtch_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, 0x11 ) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w ) // 2 x DSW + AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) // 2 x DSW // 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_PORT ( "P1" ) // P1 @@ -769,7 +769,7 @@ static ADDRESS_MAP_START( sprtmtch_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x35, 0x35 ) AM_WRITE ( dynax_blit_palette23_w ) // AM_RANGE( 0x36, 0x36 ) AM_WRITE ( dynax_blit_backpen_w ) // Background Color AM_RANGE( 0x37, 0x37 ) AM_WRITE ( dynax_vblank_ack_w ) // VBlank IRQ Ack -// AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset +// AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_flipscreen_w ) // Flip Screen AM_RANGE( 0x42, 0x42 ) AM_WRITE ( dynax_coincounter_0_w ) // Coin Counters AM_RANGE( 0x43, 0x43 ) AM_WRITE ( dynax_coincounter_1_w ) // @@ -800,18 +800,18 @@ static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x63, 0x63 ) AM_READ ( hanamai_keyboard_0_r ) // P1 AM_RANGE( 0x64, 0x64 ) AM_READ_PORT ( "DSW0" ) // DSW AM_RANGE( 0x67, 0x67 ) AM_READ_PORT ( "DSW1" ) // DSW - AM_RANGE( 0x70, 0x71 ) AM_DEVWRITE ( SOUND, "ym", ym2413_w ) // + AM_RANGE( 0x70, 0x71 ) AM_DEVWRITE ( "ym", ym2413_w ) // // AM_RANGE( 0x80, 0x80 ) AM_WRITE ( SMH_NOP ) // IRQ ack? ADDRESS_MAP_END static ADDRESS_MAP_START( nanajign_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset + AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x02, 0x02 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) // - AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE ( SOUND, "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE ( SOUND, "ay", ay8910_address_w ) // + AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE ( "ay", ay8910_data_w ) // AY8910 + AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE ( "ay", ay8910_address_w ) // AM_RANGE( 0x10, 0x10 ) AM_WRITE ( hanamai_keyboard_w ) // keyboard row select AM_RANGE( 0x11, 0x11 ) AM_READ_PORT ( "IN0" ) // Coins AM_RANGE( 0x12, 0x12 ) AM_READ ( hanamai_keyboard_1_r ) // P2 @@ -937,10 +937,10 @@ static ADDRESS_MAP_START( jantouki_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_WRITE ( jantouki_sound_rombank_w ) // BANK ROM Select AM_RANGE( 0x10, 0x10 ) AM_WRITE ( jantouki_sound_vblank_ack_w ) // VBlank IRQ Ack - AM_RANGE( 0x21, 0x21 ) AM_DEVREAD ( SOUND, "ay", ay8910_r ) // AY8910 - AM_RANGE( 0x22, 0x23 ) AM_DEVWRITE ( SOUND, "ay", ay8910_data_address_w ) // - AM_RANGE( 0x28, 0x29 ) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) // - AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset + AM_RANGE( 0x21, 0x21 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910 + AM_RANGE( 0x22, 0x23 ) AM_DEVWRITE ( "ay", ay8910_data_address_w ) // + AM_RANGE( 0x28, 0x29 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // + AM_RANGE( 0x30, 0x30 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x40, 0x40 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data AM_RANGE( 0x50, 0x50 ) AM_READ ( jantouki_soundlatch_status_r ) // Soundlatch status AM_RANGE( 0x60, 0x60 ) AM_WRITE ( jantouki_soundlatch_ack_w ) // Soundlatch status @@ -973,11 +973,11 @@ static WRITE8_HANDLER( mjelctrn_blitter_ack_w ) static ADDRESS_MAP_START( mjelctrn_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE ( SOUND, "msm", adpcm_reset_w ) // MSM5205 reset + AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE ( "msm", adpcm_reset_w ) // MSM5205 reset AM_RANGE( 0x02, 0x02 ) AM_WRITE ( adpcm_data_w ) // MSM5205 data - AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) // - AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_w ) // AY8910 - AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE( SOUND, "ay", ay8910_address_w ) // + AM_RANGE( 0x04, 0x05 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x08, 0x08 ) AM_DEVWRITE( "ay", ay8910_data_w ) // AY8910 + AM_RANGE( 0x0a, 0x0a ) AM_DEVWRITE( "ay", ay8910_address_w ) // AM_RANGE( 0x11, 0x12 ) AM_WRITE ( mjelctrn_blitter_ack_w ) //? // AM_RANGE( 0x20, 0x20 ) AM_WRITE ( SMH_NOP ) // CRT Controller // AM_RANGE( 0x21, 0x21 ) AM_WRITE ( SMH_NOP ) // CRT Controller @@ -1119,11 +1119,11 @@ static ADDRESS_MAP_START( htengoku_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x21, 0x21 ) AM_WRITE ( htengoku_coin_w ) // AM_RANGE( 0x22, 0x22 ) AM_READ ( htengoku_coin_r ) // AM_RANGE( 0x23, 0x23 ) AM_READ ( htengoku_input_r ) // - AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE ( SOUND, "ay", ay8910_address_w ) // AY8910 - AM_RANGE( 0x42, 0x42 ) AM_DEVREAD ( SOUND, "ay", ay8910_r ) // - AM_RANGE( 0x44, 0x44 ) AM_DEVWRITE ( SOUND, "ay", ay8910_data_w) // - AM_RANGE( 0x46, 0x47 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) // - AM_RANGE( 0x80, 0x8f ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w) // 6242RTC + AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE ( "ay", ay8910_address_w ) // AY8910 + AM_RANGE( 0x42, 0x42 ) AM_DEVREAD ( "ay", ay8910_r ) // + AM_RANGE( 0x44, 0x44 ) AM_DEVWRITE ( "ay", ay8910_data_w) // + AM_RANGE( 0x46, 0x47 ) AM_DEVWRITE( "ym", ym2413_w ) // + AM_RANGE( 0x80, 0x8f ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC AM_RANGE( 0xa0, 0xa3 ) AM_WRITE ( ddenlovr_palette_base_w ) // ddenlovr mixer chip AM_RANGE( 0xa4, 0xa7 ) AM_WRITE ( ddenlovr_palette_mask_w ) AM_RANGE( 0xa8, 0xab ) AM_WRITE ( ddenlovr_transparency_pen_w ) @@ -1332,7 +1332,7 @@ static READ8_HANDLER( tenkai_8000_r ) } else if ( (rombank == 0x10) && (offset < 0x10) ) { - const device_config *rtc = device_list_find_by_tag(space->machine->config->devicelist, MSM6242, "rtc"); + const device_config *rtc = devtag_get_device(space->machine, "rtc"); return msm6242_r(rtc, offset); } else if (rombank == 0x12) @@ -1348,7 +1348,7 @@ static WRITE8_HANDLER( tenkai_8000_w ) { if ( (rombank == 0x10) && (offset < 0x10) ) { - const device_config *rtc = device_list_find_by_tag(space->machine->config->devicelist, MSM6242, "rtc"); + const device_config *rtc = devtag_get_device(space->machine, "rtc"); msm6242_w(rtc, offset, data); return; } @@ -1393,10 +1393,10 @@ static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 ) 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( tenkai_8000_r, tenkai_8000_w ) - AM_RANGE( 0x10000, 0x10000 ) AM_DEVREAD ( SOUND, "ay", ay8910_r ) // AY8910 - AM_RANGE( 0x10008, 0x10008 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_w ) // - AM_RANGE( 0x10010, 0x10010 ) AM_DEVWRITE( SOUND, "ay", ay8910_address_w ) // - AM_RANGE( 0x10020, 0x10021 ) AM_DEVWRITE(SOUND, "ym", ym2413_w ) // + AM_RANGE( 0x10000, 0x10000 ) AM_DEVREAD ( "ay", ay8910_r ) // AY8910 + AM_RANGE( 0x10008, 0x10008 ) AM_DEVWRITE( "ay", ay8910_data_w ) // + AM_RANGE( 0x10010, 0x10010 ) AM_DEVWRITE( "ay", ay8910_address_w ) // + AM_RANGE( 0x10020, 0x10021 ) AM_DEVWRITE("ym", ym2413_w ) // AM_RANGE( 0x10040, 0x10040 ) AM_WRITE( dynax_blit_pen_w ) // Destination Pen AM_RANGE( 0x10044, 0x10044 ) AM_WRITE( tenkai_blit_dest_w ) // Destination Layer AM_RANGE( 0x10048, 0x10048 ) AM_WRITE( tenkai_blit_palette23_w ) // Layers Palettes diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 211fcecf737..bebfe31c1da 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -218,14 +218,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe004, 0xe004) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xe004, 0xe004) AM_DEVREAD("oki", okim6295_r) 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(SMH_ROM) - AM_RANGE(0xe001, 0xe001) AM_DEVREADWRITE(SOUND, "oki", egghunt_okibanking_r, egghunt_okibanking_w) - AM_RANGE(0xe004, 0xe004) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xe001, 0xe001) AM_DEVREADWRITE("oki", egghunt_okibanking_r, egghunt_okibanking_w) + AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index da85922699c..dae67575129 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -445,8 +445,8 @@ static ADDRESS_MAP_START( engima2_audio_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM AM_WRITENOP AM_RANGE(0x2000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xa000, 0xa001) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ffc) AM_NOP AM_RANGE(0xc000, 0xffff) AM_NOP ADDRESS_MAP_END diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index ccf93f4dc85..678db068fd7 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( eolith16_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x50000000, 0x5000ffff) AM_READWRITE(vram_r, vram_w) AM_RANGE(0x90000000, 0x9000002f) AM_WRITENOP //? AM_RANGE(0xff000000, 0xff1fffff) AM_ROM AM_REGION("user2", 0) - AM_RANGE(0xffe40000, 0xffe40001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xffe40000, 0xffe40001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0xffe80000, 0xffe80001) AM_WRITE(eeprom_w) AM_RANGE(0xffea0000, 0xffea0001) AM_READ(eolith16_custom_r) AM_RANGE(0xffea0002, 0xffea0003) AM_READ_PORT("SYSTEM") diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index dd51d0f0a37..29301687061 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -95,14 +95,14 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW") AM_WRITE(watchdog_reset_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE(epos_port_1_w) - AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS") AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS") AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("UNK") - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( dealer_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x20, 0x24) AM_WRITE(dealer_decrypt_rom) AM_RANGE(0x38, 0x38) AM_READ_PORT("DSW") // AM_RANGE(0x40, 0x40) AM_WRITE(watchdog_reset_w) diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 85e4ffa206a..aa55564cc75 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -418,7 +418,7 @@ static float cymvol,hihatvol; static TIMER_CALLBACK( equites_frq_adjuster_callback ) { - const device_config *msm = devtag_get_device(machine, SOUND, "msm"); + const device_config *msm = devtag_get_device(machine, "msm"); UINT8 frq = input_port_read(machine, FRQ_ADJUSTER_TAG); msm5232_set_clock(msm, MSM5232_MIN_CLOCK + frq * (MSM5232_MAX_CLOCK - MSM5232_MIN_CLOCK) / 100); @@ -560,10 +560,10 @@ static void equites_update_dac(running_machine *machine) // Note that PB0 goes through three filters while PB1 only goes through one. if (equites_8155_portb & 1) - dac_signed_data_w(devtag_get_device(machine, SOUND, "dac1"), equites_dac_latch); + dac_signed_data_w(devtag_get_device(machine, "dac1"), equites_dac_latch); if (equites_8155_portb & 2) - dac_signed_data_w(devtag_get_device(machine, SOUND, "dac2"), equites_dac_latch); + dac_signed_data_w(devtag_get_device(machine, "dac2"), equites_dac_latch); } static WRITE8_HANDLER(equites_dac_latch_w) @@ -612,7 +612,7 @@ static WRITE8_HANDLER(equites_8155_w) case 1: //logerror( "8155 I/O Port A write %x\n", data ); eq8155_port_a = data; - device = devtag_get_device(space->machine, SOUND, "msm"); + device = devtag_get_device(space->machine, "msm"); sound_set_output_gain(device, 0, (data >> 4) / 15.0); /* group1 from msm5232 */ sound_set_output_gain(device, 1, (data >> 4) / 15.0); /* group1 from msm5232 */ sound_set_output_gain(device, 2, (data >> 4) / 15.0); /* group1 from msm5232 */ @@ -629,7 +629,7 @@ static WRITE8_HANDLER(equites_8155_w) case 3: //logerror( "8155 I/O Port C (or control) write %x\n", data ); eq8155_port_c = data; - device = devtag_get_device(space->machine, SOUND, "msm"); + device = devtag_get_device(space->machine, "msm"); sound_set_output_gain(device, 8, (data & 0x0f) / 15.0); /* SOLO 8' from msm5232 */ if (data & 0x20) sound_set_output_gain(device, 9, (data & 0x0f) / 15.0); /* SOLO 16' from msm5232 */ @@ -759,8 +759,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) - AM_RANGE(0xc080, 0xc08d) AM_DEVWRITE(SOUND, "msm", msm5232_w) - AM_RANGE(0xc0a0, 0xc0a1) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0xc080, 0xc08d) AM_DEVWRITE("msm", msm5232_w) + AM_RANGE(0xc0a0, 0xc0a1) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0xc0b0, 0xc0b0) AM_WRITENOP // n.c. AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(equites_cymbal_ctrl_w) AM_RANGE(0xc0d0, 0xc0d0) AM_WRITE(equites_dac_latch_w) // followed by 1 (and usually 0) on 8155 port B @@ -1131,8 +1131,8 @@ static const ay8910_interface equites_8910intf = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "samples", equites_8910porta_w), - DEVCB_DEVICE_HANDLER(SOUND, "samples", equites_8910portb_w) + DEVCB_DEVICE_HANDLER("samples", equites_8910porta_w), + DEVCB_DEVICE_HANDLER("samples", equites_8910portb_w) }; diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 6c982080d0a..46f295127a9 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -307,8 +307,8 @@ static READ8_HANDLER( esd16_sound_command_r ) static ADDRESS_MAP_START( multchmp_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym3812_w ) // YM3812 - AM_RANGE(0x02, 0x02) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) // M6295 + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3812_w ) // YM3812 + AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // M6295 AM_RANGE(0x03, 0x03) AM_READ(esd16_sound_command_r ) // From Main CPU AM_RANGE(0x04, 0x04) AM_WRITE(SMH_NOP ) // ? $00, $30 AM_RANGE(0x05, 0x05) AM_WRITE(esd16_sound_rombank_w ) // ROM Bank diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 0a574ee05f9..ddadee2a024 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -272,7 +272,7 @@ static INTERRUPT_GEN( vblank_callback_esh ) static MACHINE_START( esh ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index ee9c23bf2e5..5e973e585e8 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -146,7 +146,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c index 60998fb3e01..4a9bf23301b 100644 --- a/src/mame/drivers/esripsys.c +++ b/src/mame/drivers/esripsys.c @@ -554,7 +554,7 @@ static READ8_HANDLER( tms5220_r ) if (offset == 0) { /* TMS5220 core returns status bits in D7-D6 */ - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms5220nl"); + const device_config *tms = devtag_get_device(space->machine, "tms5220nl"); UINT8 status = tms5220_status_r(tms, 0); status = ((status & 0x80) >> 5) | ((status & 0x40) >> 5) | ((status & 0x20) >> 5); @@ -567,7 +567,7 @@ static READ8_HANDLER( tms5220_r ) /* TODO: Implement correctly using the state PROM */ static WRITE8_HANDLER( tms5220_w ) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms5220nl"); + const device_config *tms = devtag_get_device(space->machine, "tms5220nl"); if (offset == 0) { tms_data = data; @@ -648,7 +648,7 @@ static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x0fff) AM_RAM /* Not installed on later PCBs */ AM_RANGE(0x2008, 0x2009) AM_READWRITE(tms5220_r, tms5220_w) - AM_RANGE(0x200a, 0x200b) AM_DEVWRITE(SOUND, "dac", esripsys_dac_w) + AM_RANGE(0x200a, 0x200b) AM_DEVWRITE("dac", esripsys_dac_w) AM_RANGE(0x200c, 0x200c) AM_WRITE(volume_dac_w) AM_RANGE(0x200d, 0x200d) AM_WRITE(control_w) AM_RANGE(0x200e, 0x200e) AM_READWRITE(s_200e_r, s_200e_w) diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 5c1ce076a08..77ced045ad4 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -94,20 +94,20 @@ static WRITE8_HANDLER( b800_w ) /* special case to return the value written to 0xb000 */ /* does it reset the chips too ? */ case 0: break; - case 0xc4: b000_ret = ay8910_r(devtag_get_device(space->machine, SOUND, "ay1"), 0); break; - case 0x94: b000_ret = ay8910_r(devtag_get_device(space->machine, SOUND, "ay2"), 0); break; - case 0x86: b000_ret = ay8910_r(devtag_get_device(space->machine, SOUND, "ay3"), 0); break; + case 0xc4: b000_ret = ay8910_r(devtag_get_device(space->machine, "ay1"), 0); break; + case 0x94: b000_ret = ay8910_r(devtag_get_device(space->machine, "ay2"), 0); break; + case 0x86: b000_ret = ay8910_r(devtag_get_device(space->machine, "ay3"), 0); break; case 0x80: switch(b800_prev) { - case 0xe0: ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay1"),0,b000_val); break; - case 0x98: ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay2"),0,b000_val); break; - case 0x83: ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay3"),0,b000_val); break; + case 0xe0: ay8910_address_w(devtag_get_device(space->machine, "ay1"),0,b000_val); break; + case 0x98: ay8910_address_w(devtag_get_device(space->machine, "ay2"),0,b000_val); break; + case 0x83: ay8910_address_w(devtag_get_device(space->machine, "ay3"),0,b000_val); break; - case 0xa0: ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay1"),0,b000_val); break; - case 0x88: ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay2"),0,b000_val); break; - case 0x81: ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay3"),0,b000_val); break; + case 0xa0: ay8910_data_w(devtag_get_device(space->machine, "ay1"),0,b000_val); break; + case 0x88: ay8910_data_w(devtag_get_device(space->machine, "ay2"),0,b000_val); break; + case 0x81: ay8910_data_w(devtag_get_device(space->machine, "ay3"),0,b000_val); break; } break; diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index dbbea7539a3..8c3671b8a4d 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -80,9 +80,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x8002, 0x8002) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x8003, 0x8003) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("sn2", sn76496_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index 930afcb84bf..2d6aab732c9 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -100,9 +100,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW1") AM_RANGE(0xc000, 0xc000) AM_WRITE(exerion_videoreg_w) AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xd800, 0xd801) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0xd802, 0xd802) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xd800, 0xd801) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0xd802, 0xd802) AM_DEVREAD("ay2", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 5fd72d1e3e0..ac1d166bb26 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -357,7 +357,7 @@ static ADDRESS_MAP_START( galsnew_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM // main program AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("user2",0) // other data AM_RANGE(0x100000, 0x3fffff) AM_ROM AM_REGION("user1",0) // main data - AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(&galsnew_bg_pixram) @@ -418,7 +418,7 @@ static ADDRESS_MAP_START( fantasia_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd80000, 0xd80001) AM_WRITE(galsnew_vram_1_bank_w) /* ??? */ //AM_RANGE(0xe00000, 0xe00015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */ AM_RANGE(0xe80000, 0xe80001) AM_WRITE(galsnew_vram_0_bank_w) /* ??? */ - AM_RANGE(0xf00000, 0xf00001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0xf00000, 0xf00001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index a277126230a..44160821534 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -282,8 +282,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE(SOUND, "ym2", ym3526_r, ym3526_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym2", ym3526_r, ym3526_w) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index 3720466a41b..12a76ffe602 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -342,7 +342,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE(SOUND, "ym", ym2151_data_latch_w) + AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE("ym", ym2151_data_latch_w) AM_RANGE(0x6000, 0x67ff) AM_WRITE(sound_nmi_rate_w) AM_RANGE(0x6800, 0x6fff) AM_READ(sound_master_latch_r) AM_RANGE(0x7000, 0x77ff) AM_READ(sound_nmi_to_slave_r) @@ -355,7 +355,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x3800) AM_RAM AM_RANGE(0x4000, 0x5fff) AM_READ(sound_slave_latch_r) - AM_RANGE(0x8000, 0xbfff) AM_DEVWRITE(SOUND, "dac", sound_slave_dac_w) + AM_RANGE(0x8000, 0xbfff) AM_DEVWRITE("dac", sound_slave_dac_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index 8fbd7d11fe8..e47e10e8653 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -224,7 +224,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -232,7 +232,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index d6a1a74ecd4..adde197922e 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -79,14 +79,14 @@ static READ32_HANDLER( f32_input_port_1_r ) static ADDRESS_MAP_START( mosaicf2_io, ADDRESS_SPACE_IO, 32 ) - AM_RANGE(0x4000, 0x4003) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x000000ff) - AM_RANGE(0x4810, 0x4813) AM_DEVREAD8(SOUND, "ym", ym2151_status_port_r, 0x000000ff) + AM_RANGE(0x4000, 0x4003) AM_DEVREAD8("oki", okim6295_r, 0x000000ff) + AM_RANGE(0x4810, 0x4813) AM_DEVREAD8("ym", ym2151_status_port_r, 0x000000ff) AM_RANGE(0x5000, 0x5003) AM_READ_PORT("P1") AM_RANGE(0x5200, 0x5203) AM_READ(f32_input_port_1_r) AM_RANGE(0x5400, 0x5403) AM_READ(eeprom_r) - AM_RANGE(0x6000, 0x6003) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x000000ff) - AM_RANGE(0x6800, 0x6803) AM_DEVWRITE8(SOUND, "ym", ym2151_data_port_w, 0x000000ff) - AM_RANGE(0x6810, 0x6813) AM_DEVWRITE8(SOUND, "ym", ym2151_register_port_w, 0x000000ff) + AM_RANGE(0x6000, 0x6003) AM_DEVWRITE8("oki", okim6295_w, 0x000000ff) + AM_RANGE(0x6800, 0x6803) AM_DEVWRITE8("ym", ym2151_data_port_w, 0x000000ff) + AM_RANGE(0x6810, 0x6813) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x000000ff) AM_RANGE(0x7000, 0x7003) AM_WRITE(eeprom_clock_line_w) AM_RANGE(0x7200, 0x7203) AM_WRITE(eeprom_cs_line_w) AM_RANGE(0x7400, 0x7403) AM_WRITE(eeprom_bit_w) diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 54086f7618d..f2e31ad7909 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -198,7 +198,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(f1gp_sh_bankswitch_w) // f1gp AM_RANGE(0x0c, 0x0c) AM_WRITE(f1gp_sh_bankswitch_w) // f1gp2 AM_RANGE(0x14, 0x14) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) ADDRESS_MAP_END static WRITE16_HANDLER( f1gpb_misc_w ) @@ -250,7 +250,7 @@ static ADDRESS_MAP_START( f1gpb_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfff008, 0xfff009) AM_READNOP //? AM_RANGE(0xfff006, 0xfff007) AM_WRITENOP AM_RANGE(0xfff00a, 0xfff00b) AM_RAM AM_BASE(&f1gpb_fgregs) - AM_RANGE(0xfff00e, 0xfff00f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xfff00e, 0xfff00f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0xfff00c, 0xfff00d) AM_WRITE(f1gpb_misc_w) AM_RANGE(0xfff010, 0xfff011) AM_WRITENOP AM_RANGE(0xfff020, 0xfff023) AM_RAM //? diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index a7cf103ca50..119b69ac54d 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -282,13 +282,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fantland_sound_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r ) - AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( SOUND, "ym", ym2151_r, ym2151_w ) - AM_RANGE( 0x0180, 0x0180 ) AM_DEVWRITE( SOUND, "dac", dac_w ) + AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ym", ym2151_r, ym2151_w ) + AM_RANGE( 0x0180, 0x0180 ) AM_DEVWRITE( "dac", dac_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( galaxygn_sound_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r ) - AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( SOUND, "ym", ym2151_r, ym2151_w ) + AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ym", ym2151_r, ym2151_w ) ADDRESS_MAP_END @@ -329,8 +329,8 @@ static WRITE8_HANDLER( borntofi_msm5205_w ) // Play / Stop switch(data) { - case 0x00: borntofi_adpcm_stop(devtag_get_device(space->machine, SOUND, msm_name[voice]), voice); break; - case 0x03: borntofi_adpcm_start(devtag_get_device(space->machine, SOUND, msm_name[voice]), voice); break; + case 0x00: borntofi_adpcm_stop(devtag_get_device(space->machine, msm_name[voice]), voice); break; + case 0x03: borntofi_adpcm_start(devtag_get_device(space->machine, msm_name[voice]), voice); break; default: logerror("CPU #0 PC = %04X: adpcm reg %d <- %02x\n", cpu_get_pc(space->cpu), reg, data); } } @@ -399,7 +399,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wheelrun_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym3526_r, ym3526_w ) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3526_r, ym3526_w ) AM_RANGE(0xb000, 0xb000) AM_WRITE( SMH_NOP ) // on a car crash / hit AM_RANGE(0xc000, 0xc000) AM_WRITE( SMH_NOP ) // "" @@ -937,7 +937,7 @@ static MACHINE_RESET( borntofi ) MACHINE_RESET_CALL(fantland); for (voice = 0; voice < 4; voice++) - borntofi_adpcm_stop(devtag_get_device(machine, SOUND, msm_name[voice]), voice); + borntofi_adpcm_stop(devtag_get_device(machine, msm_name[voice]), voice); } static MACHINE_DRIVER_START( borntofi ) diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index bb55f9d437d..58330740966 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -202,7 +202,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, 0xf801) AM_DEVREADWRITE(SOUND, "ay8910.1", SMH_NOP, ay8910_address_data_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ay8910.1", SMH_NOP, ay8910_address_data_w) ADDRESS_MAP_END @@ -238,8 +238,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r, interrupt_enable_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM) // Reset PSG's - AM_RANGE(0x5000, 0x5001) AM_DEVWRITE(SOUND, "ay8910.1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ay8910.2", ay8910_address_data_w) + AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("ay8910.1", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ay8910.2", ay8910_address_data_w) AM_RANGE(0x7000, 0x7000) AM_READ(SMH_NOP) // only for Imago, read but not used ADDRESS_MAP_END diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index e99261c6ea1..472fa386b32 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -60,7 +60,7 @@ static WRITE8_HANDLER( fastlane_bankswitch_w ) memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); /* bit 4: bank # for the 007232 (chip 2) */ - k007232_set_bank(devtag_get_device(space->machine, SOUND, "konami2"),0 + ((data & 0x10) >> 4),2 + ((data & 0x10) >> 4)); + k007232_set_bank(devtag_get_device(space->machine, "konami2"),0 + ((data & 0x10) >> 4),2 + ((data & 0x10) >> 4)); /* other bits seems to be unused */ } @@ -87,8 +87,8 @@ static ADDRESS_MAP_START( fastlane_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0803, 0x0803) AM_READ_PORT("SYSTEM") AM_RANGE(0x0900, 0x0900) AM_READ_PORT("DSW1") AM_RANGE(0x0901, 0x0901) AM_READ_PORT("DSW2") - AM_RANGE(0x0d00, 0x0d0d) AM_DEVREAD(SOUND, "konami1", fastlane_k007232_r)/* 007232 registers (chip 1) */ - AM_RANGE(0x0e00, 0x0e0d) AM_DEVREAD(SOUND, "konami2", fastlane_k007232_r)/* 007232 registers (chip 2) */ + AM_RANGE(0x0d00, 0x0d0d) AM_DEVREAD("konami1", fastlane_k007232_r)/* 007232 registers (chip 1) */ + AM_RANGE(0x0e00, 0x0e0d) AM_DEVREAD("konami2", fastlane_k007232_r)/* 007232 registers (chip 2) */ AM_RANGE(0x0f00, 0x0f1f) AM_READ(K051733_r) /* 051733 (protection) */ AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_RAM) /* Palette RAM/Work RAM */ AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) /* Video RAM + Sprite RAM */ @@ -100,8 +100,8 @@ static ADDRESS_MAP_START( fastlane_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x005f) AM_WRITE(k007121_registers_w) AM_BASE(&fastlane_k007121_regs)/* 007121 registers */ AM_RANGE(0x0b00, 0x0b00) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0x0c00, 0x0c00) AM_WRITE(fastlane_bankswitch_w) /* bankswitch control */ - AM_RANGE(0x0d00, 0x0d0d) AM_DEVWRITE(SOUND, "konami1", fastlane_k007232_w) /* 007232 registers (chip 1) */ - AM_RANGE(0x0e00, 0x0e0d) AM_DEVWRITE(SOUND, "konami2", fastlane_k007232_w) /* 007232 registers (chip 2) */ + AM_RANGE(0x0d00, 0x0d0d) AM_DEVWRITE("konami1", fastlane_k007232_w) /* 007232 registers (chip 1) */ + AM_RANGE(0x0e00, 0x0e0d) AM_DEVWRITE("konami2", fastlane_k007232_w) /* 007232 registers (chip 2) */ AM_RANGE(0x0f00, 0x0f1f) AM_WRITE(K051733_w) /* 051733 (protection) */ AM_RANGE(0x1000, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram)/* palette RAM */ AM_RANGE(0x1800, 0x1fff) AM_WRITE(SMH_RAM) /* Work RAM */ diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index a352c71f7d4..ba87809e5d6 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -220,12 +220,12 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0x8001, 0x8001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8002, 0x8003) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0xa001, 0xa001) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0xa002, 0xa003) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0xc001, 0xc001) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0xc002, 0xc003) AM_DEVWRITE(SOUND, "ay3", ay8910_data_address_w) + AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8002, 0x8003) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0xa001, 0xa001) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("ay3", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index c40381b2be1..f9cd7166625 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -57,8 +57,8 @@ static WRITE8_HANDLER( fcrash_snd_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "soundcpu"); int bankaddr; - sound_set_output_gain(devtag_get_device(space->machine, SOUND, "msm1"), 0, (data & 0x08) ? 0.0 : 1.0); - sound_set_output_gain(devtag_get_device(space->machine, SOUND, "msm2"), 0, (data & 0x10) ? 0.0 : 1.0); + sound_set_output_gain(devtag_get_device(space->machine, "msm1"), 0, (data & 0x08) ? 0.0 : 1.0); + sound_set_output_gain(devtag_get_device(space->machine, "msm2"), 0, (data & 0x10) ? 0.0 : 1.0); bankaddr = ((data & 7) * 0x4000); memory_set_bankptr(space->machine, 1,&RAM[0x10000 + bankaddr]); @@ -364,8 +364,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xd000, 0xd7ff) AM_RAM - AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0xdc00, 0xdc01) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0xdc00, 0xdc01) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(fcrash_snd_bankswitch_w) AM_RANGE(0xe400, 0xe400) AM_READ(soundlatch_r) AM_RANGE(0xe800, 0xe800) AM_WRITE(fcrash_msm5205_0_data_w) diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 73e9edd4efe..33e2043f5b4 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -135,7 +135,7 @@ static WRITE32_HANDLER( output_w ) //data>>16 & 2 coin out coin_counter_w(1,data>>16 & 4); //data>>16 & 8 coin hopper - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), 0x40000 * (((data>>16) & 0x20)>>5)); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), 0x40000 * (((data>>16) & 0x20)>>5)); } if(ACCESSING_BITS_0_15) { @@ -152,7 +152,7 @@ static ADDRESS_MAP_START( feversoc_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x06000000, 0x06000003) AM_WRITE(output_w) AM_RANGE(0x06000004, 0x06000007) AM_WRITENOP //??? AM_RANGE(0x06000008, 0x0600000b) AM_READ(in0_r) - AM_RANGE(0x0600000c, 0x0600000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff0000) + AM_RANGE(0x0600000c, 0x0600000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff0000) // AM_RANGE(0x06010000, 0x06017fff) AM_RAM //contains RISE11 keys and other related stuff. AM_RANGE(0x06018000, 0x06019fff) AM_RAM_WRITE(fs_paletteram_w) AM_BASE(&paletteram32) ADDRESS_MAP_END diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index b130fa8bf5f..d3f373cc3a7 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0813, 0x0813) AM_READ_PORT("DSW1") AM_RANGE(0x0818, 0x0818) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0819, 0x0819) AM_WRITE(finalizr_coin_w) - AM_RANGE(0x081a, 0x081a) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0x081a, 0x081a) AM_DEVWRITE("sn", sn76496_w) /* This address triggers the SN chip to read the data port. */ 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 */ @@ -134,7 +134,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0xff) AM_READ(soundlatch_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_w) AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_WRITE(i8039_T0_w) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(i8039_T1_r) diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c index 7f2943ef41b..1ba2c32ed90 100644 --- a/src/mame/drivers/findout.c +++ b/src/mame/drivers/findout.c @@ -101,7 +101,7 @@ static WRITE8_DEVICE_HANDLER( sound_w ) interrupt_enable_w(space, 0,data & 0x40); /* bit 7 goes directly to the sound amplifier */ - dac_data_w(devtag_get_device(device->machine, SOUND, "dac"), ((data & 0x80) >> 7) * 255); + dac_data_w(devtag_get_device(device->machine, "dac"), ((data & 0x80) >> 7) * 255); // logerror("%s: sound_w %02x\n",cpuexec_describe_context(device->machine),data); // popmessage("%02x",data); @@ -195,8 +195,8 @@ static WRITE8_HANDLER( signature_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) - AM_RANGE(0x4800, 0x4803) AM_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0x5000, 0x5003) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x4800, 0x4803) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0x5000, 0x5003) AM_DEVREAD("ppi8255_1", ppi8255_r) AM_RANGE(0x6400, 0x6400) AM_READ(signature_r) AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) @@ -206,8 +206,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0x5000, 0x5003) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x4800, 0x4803) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0x5000, 0x5003) AM_DEVWRITE("ppi8255_1", ppi8255_w) /* banked ROMs are enabled by low 6 bits of the address */ AM_RANGE(0x603e, 0x603e) AM_WRITE(banksel_1_w) AM_RANGE(0x603d, 0x603d) AM_WRITE(banksel_2_w) diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 39968ea6731..50e1ab39099 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -1752,7 +1752,7 @@ static ADDRESS_MAP_START( firebeat_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x74000000, 0x740003ff) AM_READWRITE(ppc_spu_share_r, ppc_spu_share_w) // SPU shared RAM AM_RANGE(0x7d000200, 0x7d00021f) AM_READ(cabinet_r) AM_RANGE(0x7d000340, 0x7d000347) AM_READ(sensor_r) - AM_RANGE(0x7d000400, 0x7d000403) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0xffff0000) + AM_RANGE(0x7d000400, 0x7d000403) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0xffff0000) AM_RANGE(0x7d000800, 0x7d000803) AM_READ(input_r) AM_RANGE(0x7d400000, 0x7d5fffff) AM_READWRITE(flashram_r, flashram_w) AM_RANGE(0x7d800000, 0x7dbfffff) AM_READWRITE(soundflash_r, soundflash_w) @@ -1976,7 +1976,7 @@ static MACHINE_RESET( firebeat ) } SCSIGetDevice( atapi_device_data[1], &cd ); - cdda_set_cdrom(devtag_get_device(machine, SOUND, "cdda"), cd); + cdda_set_cdrom(devtag_get_device(machine, "cdda"), cd); } static MACHINE_DRIVER_START(firebeat) diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index fd4d396b4af..c5be8bfb762 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -102,7 +102,7 @@ static WRITE8_HANDLER( firefox_disc_lock_w ) static WRITE8_HANDLER( audio_enable_w ) { - sound_set_output_gain(devtag_get_device(space->machine, SOUND, "ldsound"), ~offset & 1, (data & 0x80) ? 1.0 : 0.0); + sound_set_output_gain(devtag_get_device(space->machine, "ldsound"), ~offset & 1, (data & 0x80) ? 1.0 : 0.0); } static WRITE8_HANDLER( firefox_disc_reset_w ) @@ -301,14 +301,14 @@ static UINT8 riot_porta_r(const device_config *device, UINT8 olddata) /* bit 1 = TMS /read */ /* bit 0 = TMS /write */ - const device_config *tms = devtag_get_device(device->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(device->machine, "tms"); return (main_to_sound_flag << 7) | (sound_to_main_flag << 6) | 0x10 | (!tms5220_ready_r(tms) << 2); } static void riot_porta_w(const device_config *device, UINT8 newdata, UINT8 olddata) { - const device_config *tms = devtag_get_device(device->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(device->machine, "tms"); /* handle 5220 read */ if ((olddata & 2) != 0 && (newdata & 2) == 0) @@ -437,10 +437,10 @@ static void firq_gen(const device_config *device, int state) static MACHINE_START( firefox ) { memory_configure_bank(machine, 1, 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x1000); - nvram_1c = devtag_get_device(machine, X2212, "nvram_1c"); - nvram_1d = devtag_get_device(machine, X2212, "nvram_1d"); + nvram_1c = devtag_get_device(machine, "nvram_1c"); + nvram_1d = devtag_get_device(machine, "nvram_1d"); - laserdisc = devtag_get_device(machine, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); vp931_set_data_ready_callback(laserdisc, firq_gen); control_num = 0; @@ -503,13 +503,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0700) AM_RAM /* RIOT ram */ - AM_RANGE(0x0880, 0x089f) AM_MIRROR(0x07e0) AM_DEVREADWRITE(RIOT6532,"riot",riot6532_r, riot6532_w) + AM_RANGE(0x0880, 0x089f) AM_MIRROR(0x07e0) AM_DEVREADWRITE("riot",riot6532_r, riot6532_w) AM_RANGE(0x1000, 0x1000) AM_READ(main_to_sound_r) AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_to_main_w) - AM_RANGE(0x2000, 0x200f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x2800, 0x280f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) - AM_RANGE(0x3000, 0x300f) AM_DEVREADWRITE(SOUND, "pokey3", pokey_r, pokey_w) - AM_RANGE(0x3800, 0x380f) AM_DEVREADWRITE(SOUND, "pokey4", pokey_r, pokey_w) + AM_RANGE(0x2000, 0x200f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x2800, 0x280f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) + AM_RANGE(0x3000, 0x300f) AM_DEVREADWRITE("pokey3", pokey_r, pokey_w) + AM_RANGE(0x3800, 0x380f) AM_DEVREADWRITE("pokey4", pokey_r, pokey_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 7da8044d1a6..e2ddc9bfaad 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -206,7 +206,7 @@ static WRITE8_HANDLER( firetrap_sound_command_w ) static WRITE8_HANDLER( firetrap_sound_2400_w ) { - msm5205_reset_w(devtag_get_device(space->machine, SOUND, "msm"),~data & 0x01); + msm5205_reset_w(devtag_get_device(space->machine, "msm"),~data & 0x01); firetrap_irq_enable = data & 0x02; } @@ -317,7 +317,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym", ym3526_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym", ym3526_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) diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index f7b599d4e50..49da3c411e3 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -39,7 +39,7 @@ static INPUT_CHANGED( service_mode_switch_changed ) static INPUT_CHANGED( firetrk_horn_changed ) { - const device_config *discrete = devtag_get_device(field->port->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(field->port->machine, "discrete"); discrete_sound_w(discrete, FIRETRUCK_HORN_EN, newval); } @@ -54,7 +54,7 @@ static INPUT_CHANGED( gear_changed ) static INTERRUPT_GEN( firetrk_interrupt ) { /* Super Bug - ASR - when is this used and what is an ASR? */ -// discrete_sound_w(devtag_get_device(machine, SOUND, "discrete"), SUPERBUG_ASR_EN, 0); +// discrete_sound_w(devtag_get_device(machine, "discrete"), SUPERBUG_ASR_EN, 0); /* NMI interrupts are disabled during service mode in firetrk and montecar */ if (!in_service_mode) @@ -80,7 +80,7 @@ static TIMER_CALLBACK( periodic_callback ) static WRITE8_HANDLER( firetrk_output_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); /* BIT0 => START1 LAMP */ set_led_status(0, !(data & 0x01)); @@ -111,7 +111,7 @@ static WRITE8_HANDLER( firetrk_output_w ) static WRITE8_HANDLER( superbug_output_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); /* BIT0 => START LAMP */ set_led_status(0, offset & 0x01); @@ -131,7 +131,7 @@ static WRITE8_HANDLER( superbug_output_w ) static WRITE8_HANDLER( montecar_output_1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); /* BIT0 => START LAMP */ set_led_status(0, !(data & 0x01)); @@ -158,7 +158,7 @@ static WRITE8_HANDLER( montecar_output_1_w ) static WRITE8_HANDLER( montecar_output_2_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); firetrk_flash = data & 0x80; @@ -326,19 +326,19 @@ static ADDRESS_MAP_START( firetrk_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", firetrk_skid_reset_w) + AM_RANGE(0x1060, 0x1060) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_skid_reset_w) 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_DEVWRITE(SOUND, "discrete", firetrk_motor_snd_w) - AM_RANGE(0x1420, 0x1420) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_crash_snd_w) - AM_RANGE(0x1440, 0x1440) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_skid_snd_w) + AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_motor_snd_w) + AM_RANGE(0x1420, 0x1420) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_crash_snd_w) + AM_RANGE(0x1440, 0x1440) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_skid_snd_w) 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_DEVWRITE(SOUND, "discrete", firetrk_xtndply_w) + AM_RANGE(0x14e0, 0x14e0) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_xtndply_w) 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 @@ -351,18 +351,18 @@ static ADDRESS_MAP_START( superbug_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", firetrk_skid_reset_w) + AM_RANGE(0x0160, 0x0160) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_skid_reset_w) 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) AM_RANGE(0x0200, 0x0207) AM_MIRROR(0x0018) AM_READ(firetrk_input_r) - AM_RANGE(0x0220, 0x0220) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", superbug_asr_w) + AM_RANGE(0x0220, 0x0220) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", superbug_asr_w) AM_RANGE(0x0240, 0x0243) AM_MIRROR(0x001c) AM_READ(firetrk_dip_r) AM_RANGE(0x0260, 0x026f) AM_MIRROR(0x0010) AM_WRITE(superbug_output_w) - AM_RANGE(0x0280, 0x0280) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", superbug_motor_snd_w) - AM_RANGE(0x02a0, 0x02a0) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_crash_snd_w) - AM_RANGE(0x02c0, 0x02c0) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_skid_snd_w) + AM_RANGE(0x0280, 0x0280) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", superbug_motor_snd_w) + AM_RANGE(0x02a0, 0x02a0) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_crash_snd_w) + AM_RANGE(0x02c0, 0x02c0) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_skid_snd_w) AM_RANGE(0x0400, 0x041f) AM_RAM AM_BASE(&firetrk_alpha_num_ram) AM_RANGE(0x0500, 0x05ff) AM_RAM AM_BASE(&firetrk_playfield_ram) AM_RANGE(0x0800, 0x1fff) AM_ROM @@ -380,10 +380,10 @@ static ADDRESS_MAP_START( montecar_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", montecar_skid_reset_w) - AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_motor_snd_w) - AM_RANGE(0x1420, 0x1420) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_crash_snd_w) - AM_RANGE(0x1440, 0x1440) AM_MIRROR(0x001f) AM_DEVWRITE(SOUND, "discrete", firetrk_skid_snd_w) + AM_RANGE(0x10e0, 0x10e0) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", montecar_skid_reset_w) + AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_motor_snd_w) + AM_RANGE(0x1420, 0x1420) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_crash_snd_w) + AM_RANGE(0x1440, 0x1440) AM_MIRROR(0x001f) AM_DEVWRITE("discrete", firetrk_skid_snd_w) 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) diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 098b5c4db00..588d0bd899a 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -31,7 +31,7 @@ static int multiply_reg[2]; static MACHINE_RESET( flkatck ) { - k007232_set_bank( devtag_get_device(machine, SOUND, "konami"), 0, 1 ); + k007232_set_bank( devtag_get_device(machine, "konami"), 0, 1 ); } static INTERRUPT_GEN( flkatck_interrupt ) @@ -133,8 +133,8 @@ static ADDRESS_MAP_START( flkatck_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) // 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_DEVREAD(SOUND, "konami", k007232_r) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM2151 */ + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami", k007232_r) /* 007232 registers */ + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( flkatck_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) @@ -143,8 +143,8 @@ static ADDRESS_MAP_START( flkatck_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9001) AM_WRITE(multiply_w) /* ??? */ // AM_RANGE(0x9001, 0x9001) AM_WRITE(SMH_RAM) /* ??? */ AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_RAM) /* ??? */ - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami", k007232_w) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM2151 */ + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami", k007232_w) /* 007232 registers */ + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) /* YM2151 */ ADDRESS_MAP_END diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index edb4e102dcf..82576b7422f 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -232,14 +232,14 @@ static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE(SOUND, "msm", msm5232_w) - AM_RANGE(0xcc00, 0xcc00) AM_DEVWRITE(SOUND, "msm", sound_control_0_w) - AM_RANGE(0xce00, 0xce00) AM_DEVWRITE(SOUND, "msm", sound_control_1_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xca00, 0xca0d) AM_DEVWRITE("msm", msm5232_w) + AM_RANGE(0xcc00, 0xcc00) AM_DEVWRITE("msm", sound_control_0_w) + AM_RANGE(0xce00, 0xce00) AM_DEVWRITE("msm", sound_control_1_w) AM_RANGE(0xd800, 0xd800) AM_READWRITE(soundlatch_r, to_main_w) 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_READNOP AM_DEVWRITE(SOUND, "dac", dac_w) /* signed 8-bit DAC & unknown read */ + AM_RANGE(0xde00, 0xde00) AM_READNOP AM_DEVWRITE("dac", dac_w) /* signed 8-bit DAC & unknown read */ AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostics ROM */ ADDRESS_MAP_END @@ -642,7 +642,7 @@ static const ay8910_interface ay8910_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "ay", sound_control_2_w), + DEVCB_DEVICE_HANDLER("ay", sound_control_2_w), DEVCB_HANDLER(sound_control_3_w) }; diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index d79ee277a30..115f86755be 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -227,9 +227,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x950000, 0x9501ff) AM_MIRROR(0x023e00) AM_WRITE(foodf_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x954000, 0x954001) AM_MIRROR(0x023ffe) AM_WRITENOP /* RECALL */ AM_RANGE(0x958000, 0x958001) AM_MIRROR(0x023ffe) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) - AM_RANGE(0xa40000, 0xa4001f) AM_MIRROR(0x03ffe0) AM_DEVREADWRITE8(SOUND, "pokey2", pokey_r, pokey_w, 0x00ff) - AM_RANGE(0xa80000, 0xa8001f) AM_MIRROR(0x03ffe0) AM_DEVREADWRITE8(SOUND, "pokey1", pokey_r, pokey_w, 0x00ff) - AM_RANGE(0xac0000, 0xac001f) AM_MIRROR(0x03ffe0) AM_DEVREADWRITE8(SOUND, "pokey3", pokey_r, pokey_w, 0x00ff) + AM_RANGE(0xa40000, 0xa4001f) AM_MIRROR(0x03ffe0) AM_DEVREADWRITE8("pokey2", pokey_r, pokey_w, 0x00ff) + AM_RANGE(0xa80000, 0xa8001f) AM_MIRROR(0x03ffe0) AM_DEVREADWRITE8("pokey1", pokey_r, pokey_w, 0x00ff) + AM_RANGE(0xac0000, 0xac001f) AM_MIRROR(0x03ffe0) AM_DEVREADWRITE8("pokey3", pokey_r, pokey_w, 0x00ff) ADDRESS_MAP_END diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c index 7adaeb97ace..4a5850bed93 100644 --- a/src/mame/drivers/forte2.c +++ b/src/mame/drivers/forte2.c @@ -37,8 +37,8 @@ static ADDRESS_MAP_START( io_mem, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x98, 0x98) AM_READWRITE( TMS9928A_vram_r, TMS9928A_vram_w ) AM_RANGE(0x99, 0x99) AM_READWRITE( TMS9928A_register_r, TMS9928A_register_w ) - AM_RANGE(0xa0, 0xa1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xa2, 0xa2) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xa0, 0xa1) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xa2, 0xa2) AM_DEVREAD("ay", ay8910_r) //Ports a8-ab are originally for communicating with the i8255 PPI on MSX. //( http://map.tni.nl/resources/msx_io_ports.php#ppi ) diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 6c2b7d72acb..c9587c59a58 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -109,9 +109,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fortecar_ports, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x20, 0x21) AM_WRITE(fortecar_videoregs_w) // MC6845? - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x60, 0x62) AM_DEVREADWRITE(PPI8255, "fcppi0", ppi8255_r, ppi8255_w)//M5L8255AP + AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x60, 0x62) AM_DEVREADWRITE("fcppi0", ppi8255_r, ppi8255_w)//M5L8255AP AM_RANGE(0x81, 0x81) AM_WRITE(rom_bank_w) //completely wrong,might not be there... AM_RANGE(0xa0, 0xa0) AM_READ_PORT("IN0") //written too,multiplexer? AM_RANGE(0xa1, 0xa1) AM_READ_PORT("IN1") diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 613518deba2..472113078be 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -195,10 +195,10 @@ static ADDRESS_MAP_START( pbillrd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe002, 0xe003) AM_WRITE(coin_w) AM_RANGE(0xe004, 0xe004) AM_WRITE(nmi_enable_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(pbillrd_bankswitch_w) - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE(SOUND, "sn4", sn76496_w) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76496_w) ADDRESS_MAP_END static ADDRESS_MAP_START( freekckb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -206,8 +206,8 @@ static ADDRESS_MAP_START( freekckb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0xf000, 0xf003) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0xec00, 0xec03) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0xf000, 0xf003) AM_DEVREAD("ppi8255_1", ppi8255_r) AM_RANGE(0xf800, 0xf800) AM_READ_PORT("IN0") AM_RANGE(0xf801, 0xf801) AM_READ_PORT("IN1") AM_RANGE(0xf802, 0xf802) AM_READ(SMH_NOP) //MUST return bit 0 = 0, otherwise game resets @@ -219,16 +219,16 @@ static ADDRESS_MAP_START( freekckb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xec00, 0xec03) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0xf000, 0xf003) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0xec00, 0xec03) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0xf000, 0xf003) AM_DEVWRITE("ppi8255_1", ppi8255_w) AM_RANGE(0xf800, 0xf801) AM_WRITE(flipscreen_w) AM_RANGE(0xf802, 0xf803) AM_WRITE(coin_w) AM_RANGE(0xf804, 0xf804) AM_WRITE(nmi_enable_w) AM_RANGE(0xf806, 0xf806) AM_WRITE(spinner_select_w) - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE(SOUND, "sn4", sn76496_w) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76496_w) ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -252,10 +252,10 @@ static ADDRESS_MAP_START( gigas_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe004, 0xe004) AM_WRITE(nmi_enable_w) AM_RANGE(0xe005, 0xe005) AM_WRITE(SMH_NOP) AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) //bankswitch ? - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE(SOUND, "sn4", sn76496_w) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76496_w) ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 4952118d16d..fd3941f55f5 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -436,7 +436,7 @@ static ADDRESS_MAP_START( fromanc2_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, SMH_NOP) // snd cmd (1P) / ? AM_RANGE(0x04, 0x04) AM_READ(soundlatch2_r) // snd cmd (2P) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0x0c, 0x0c) AM_READ(fromanc2_sndcpu_nmi_clr) ADDRESS_MAP_END diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 8129aab4402..7ac239e139e 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -335,9 +335,9 @@ static ADDRESS_MAP_START( nekkyoku_sub_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xe1, 0xe1) AM_READWRITE(fromance_busycheck_sub_r, fromance_gfxreg_w) AM_RANGE(0xe2, 0xe5) AM_WRITE(fromance_scroll_w) AM_RANGE(0xe6, 0xe6) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w) - AM_RANGE(0xe7, 0xe7) AM_DEVWRITE(SOUND, "msm", fromance_adpcm_reset_w) + AM_RANGE(0xe7, 0xe7) AM_DEVWRITE("msm", fromance_adpcm_reset_w) AM_RANGE(0xe8, 0xe8) AM_WRITE(fromance_adpcm_w) - AM_RANGE(0xe9, 0xea) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0xe9, 0xea) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( idolmj_sub_io_map, ADDRESS_SPACE_IO, 8 ) @@ -349,9 +349,9 @@ static ADDRESS_MAP_START( idolmj_sub_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READWRITE(fromance_busycheck_sub_r, fromance_gfxreg_w) AM_RANGE(0x22, 0x25) AM_WRITE(fromance_scroll_w) AM_RANGE(0x26, 0x26) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w) - AM_RANGE(0x27, 0x27) AM_DEVWRITE(SOUND, "msm", fromance_adpcm_reset_w) + AM_RANGE(0x27, 0x27) AM_DEVWRITE("msm", fromance_adpcm_reset_w) AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w) - AM_RANGE(0x29, 0x2a) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x29, 0x2a) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_sub_io_map, ADDRESS_SPACE_IO, 8 ) @@ -363,9 +363,9 @@ static ADDRESS_MAP_START( fromance_sub_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READWRITE(fromance_busycheck_sub_r, fromance_gfxreg_w) AM_RANGE(0x22, 0x25) AM_WRITE(fromance_scroll_w) AM_RANGE(0x26, 0x26) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w) - AM_RANGE(0x27, 0x27) AM_DEVWRITE(SOUND, "msm", fromance_adpcm_reset_w) + AM_RANGE(0x27, 0x27) AM_DEVWRITE("msm", fromance_adpcm_reset_w) AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w) - AM_RANGE(0x2a, 0x2b) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x2a, 0x2b) AM_DEVWRITE("ym", ym2413_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index 0bcb4036a6d..bb789cb71f6 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -122,8 +122,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 3f7666f7ed3..bbb0d57704e 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -135,8 +135,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki", okim6295_r) 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(SMH_BANK8) @@ -145,8 +145,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki", okim6295_w) 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) diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index dd3431f9126..9ba79869b8e 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -1085,12 +1085,12 @@ static WRITE8_DEVICE_HANDLER(pia1_ca2_w) static ADDRESS_MAP_START( funworld_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD(SOUND, "ay8910", ay8910_r) - AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_data_w) - AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD("ay8910", ay8910_r) + AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE("ay8910", ay8910_address_data_w) + AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram) AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4000, 0x4000) AM_READNOP @@ -1100,12 +1100,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magicrd2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD(SOUND, "ay8910", ay8910_r) - AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_data_w) - AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD("ay8910", ay8910_r) + AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE("ay8910", ay8910_address_data_w) + AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x2c00, 0x2cff) AM_RAM /* range for protection */ AM_RANGE(0x3600, 0x36ff) AM_RAM /* some games use $3603-05 range for protection */ AM_RANGE(0x3c00, 0x3cff) AM_RAM /* range for protection */ @@ -1116,12 +1116,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cuoreuno_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD(SOUND, "ay8910", ay8910_r) - AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_data_w) - AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x0c00, 0x0c00) AM_DEVREAD("ay8910", ay8910_r) + AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE("ay8910", ay8910_address_data_w) + AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads */ AM_RANGE(0x3e00, 0x3fff) AM_RAM /* some games use $3e03-05 range for protection */ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram) @@ -1131,12 +1131,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( royalmcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x2a00, 0x2a03) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x2c00, 0x2c00) AM_DEVREAD(SOUND, "ay8910", ay8910_r) - AM_RANGE(0x2c00, 0x2c01) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_data_w) - AM_RANGE(0x2e00, 0x2e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x2e01, 0x2e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x2a00, 0x2a03) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x2c00, 0x2c00) AM_DEVREAD("ay8910", ay8910_r) + AM_RANGE(0x2c00, 0x2c01) AM_DEVWRITE("ay8910", ay8910_address_data_w) + AM_RANGE(0x2e00, 0x2e00) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x2e01, 0x2e01) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram) AM_RANGE(0x5000, 0x5fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(&colorram) AM_RANGE(0x6000, 0xffff) AM_ROM @@ -1146,11 +1146,11 @@ static ADDRESS_MAP_START( saloon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0") AM_RANGE(0x0a01, 0x0a01) AM_READ_PORT("IN1") - AM_RANGE(0x081c, 0x081c) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x081d, 0x081d) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x081c, 0x081c) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x081d, 0x081d) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x1000, 0x1000) AM_READ_PORT("IN2") - AM_RANGE(0x1800, 0x1800) AM_DEVREAD(SOUND, "ay8910", ay8910_r) - AM_RANGE(0x1800, 0x1801) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_data_w) + AM_RANGE(0x1800, 0x1800) AM_DEVREAD("ay8910", ay8910_r) + AM_RANGE(0x1800, 0x1801) AM_DEVWRITE("ay8910", ay8910_address_data_w) // AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads... maybe a DSW */ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram) AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(&colorram) diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index 1d6007f2f64..b0bd6363f91 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -123,15 +123,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( soundreadmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "oki", funybubl_oki_bank_sw) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", funybubl_oki_bank_sw) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index ff57c6684dd..f13552fd810 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -163,12 +163,12 @@ static ADDRESS_MAP_START( fuuki16_sound_io_map, 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_READWRITE(soundlatch_r, SMH_NOP ) // From Main CPU / ? To Main CPU ? - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "oki", fuuki16_oki_banking_w ) // Oki Banking + AM_RANGE(0x20, 0x20) AM_DEVWRITE("oki", fuuki16_oki_banking_w ) // Oki Banking AM_RANGE(0x30, 0x30) AM_WRITE(SMH_NOP ) // ? In the NMI routine - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ym1", ym2203_w ) - AM_RANGE(0x50, 0x51) AM_DEVREADWRITE(SOUND, "ym2", ym3812_r, ym3812_w ) - AM_RANGE(0x60, 0x60) AM_DEVREAD(SOUND, "oki", okim6295_r) // M6295 - AM_RANGE(0x61, 0x61) AM_DEVWRITE(SOUND, "oki", okim6295_w) // M6295 + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym1", ym2203_w ) + AM_RANGE(0x50, 0x51) AM_DEVREADWRITE("ym2", ym3812_r, ym3812_w ) + AM_RANGE(0x60, 0x60) AM_DEVREAD("oki", okim6295_r) // M6295 + AM_RANGE(0x61, 0x61) AM_DEVWRITE("oki", okim6295_w) // M6295 ADDRESS_MAP_END diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index c1ae1cfbbdc..f190f52c276 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -352,7 +352,7 @@ static ADDRESS_MAP_START( fuuki32_sound_io_map, 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(SMH_NOP) - AM_RANGE(0x40, 0x45) AM_DEVREADWRITE(SOUND, "ymf", ymf278b_r, ymf278b_w) + AM_RANGE(0x40, 0x45) AM_DEVREADWRITE("ymf", ymf278b_r, ymf278b_w) ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index beed3ab8fe7..6dbb496fb4a 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -165,17 +165,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bigkarnk_readmem_snd, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) /* RAM */ - AM_RANGE(0x0800, 0x0801) AM_DEVREAD(SOUND, "oki", okim6295_r) /* OKI6295 */ - AM_RANGE(0x0a00, 0x0a01) AM_DEVREAD(SOUND, "ym", ym3812_r) /* YM3812 */ + AM_RANGE(0x0800, 0x0801) AM_DEVREAD("oki", okim6295_r) /* OKI6295 */ + AM_RANGE(0x0a00, 0x0a01) AM_DEVREAD("ym", ym3812_r) /* YM3812 */ AM_RANGE(0x0b00, 0x0b00) AM_READ(soundlatch_r) /* Sound latch */ 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(SMH_RAM) /* RAM */ - AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(SOUND, "oki", okim6295_w) /* OKI6295 */ + AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("oki", okim6295_w) /* OKI6295 */ // AM_RANGE(0x0900, 0x0900) AM_WRITE(SMH_NOP) /* enable sound output? */ - AM_RANGE(0x0a00, 0x0a01) AM_DEVWRITE(SOUND, "ym", ym3812_w) /* YM3812 */ + AM_RANGE(0x0a00, 0x0a01) AM_DEVWRITE("ym", ym3812_w) /* YM3812 */ AM_RANGE(0x0c00, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END @@ -299,7 +299,7 @@ static ADDRESS_MAP_START( maniacsq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1") AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1") AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2") - AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff)/* OKI6295 status register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8("oki", okim6295_r, 0x00ff)/* OKI6295 status register */ AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -321,7 +321,7 @@ static ADDRESS_MAP_START( maniacsq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) /* OKI6295 data register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) /* OKI6295 data register */ AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -599,7 +599,7 @@ static ADDRESS_MAP_START( squash_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1") AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1") AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2") - AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff)/* OKI6295 status register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8("oki", okim6295_r, 0x00ff)/* OKI6295 status register */ AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -612,7 +612,7 @@ static ADDRESS_MAP_START( squash_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) /* OKI6295 data register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) /* OKI6295 data register */ AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -763,7 +763,7 @@ static ADDRESS_MAP_START( thoop_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) /* OKI6295 data register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) /* OKI6295 data register */ AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 6634821ab5e..e4e39d30159 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -58,7 +58,7 @@ GFXDECODEINFO(0x0400000, 128) static ADDRESS_MAP_START( maniacsq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD(SOUND, "gaelco", gaelcosnd_r) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD("gaelco", gaelcosnd_r) /* Sound 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 */ @@ -70,7 +70,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( maniacsq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE(SOUND, "gaelco", gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE("gaelco", 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(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ @@ -225,7 +225,7 @@ static READ16_HANDLER(p2_gun_y) {return (input_port_read(space->machine, "LIGHT1 static ADDRESS_MAP_START( bang_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD(SOUND, "gaelco", gaelcosnd_r) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD("gaelco", gaelcosnd_r) /* Sound 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 */ @@ -242,7 +242,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bang_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE(SOUND, "gaelco", gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE("gaelco", 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(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ @@ -391,7 +391,7 @@ ROM_END static ADDRESS_MAP_START( alighunt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD(SOUND, "gaelco", gaelcosnd_r) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD("gaelco", gaelcosnd_r) /* Sound 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 */ @@ -403,7 +403,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( alighunt_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE(SOUND, "gaelco", gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE("gaelco", 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(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ @@ -612,7 +612,7 @@ static READ16_HANDLER ( dallas_kludge_r ) static ADDRESS_MAP_START( touchgo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD(SOUND, "gaelco", gaelcosnd_r) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD("gaelco", gaelcosnd_r) /* Sound 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 */ @@ -626,7 +626,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( touchgo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE(SOUND, "gaelco", gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE("gaelco", 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(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ @@ -886,7 +886,7 @@ ROM_END static ADDRESS_MAP_START( snowboar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD(SOUND, "gaelco", gaelcosnd_r) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD("gaelco", gaelcosnd_r) /* Sound 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 */ @@ -900,7 +900,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snowboar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE(SOUND, "gaelco", gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE("gaelco", 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(SMH_RAM) /* Extra RAM */ @@ -1083,7 +1083,7 @@ ROM_END static ADDRESS_MAP_START( wrally2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD(SOUND, "gaelco", gaelcosnd_r) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVREAD("gaelco", gaelcosnd_r) /* Sound 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 */ @@ -1097,7 +1097,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wrally2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ - AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE(SOUND, "gaelco", gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ + AM_RANGE(0x202890, 0x2028ff) AM_DEVWRITE("gaelco", 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(SMH_RAM) /* Extra RAM */ diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 471e833e064..143624b9b5b 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -208,7 +208,7 @@ static MACHINE_RESET( common ) { char buffer[10]; sprintf(buffer, "dac%d", i + 1); - dmadac[i] = devtag_get_device(machine, SOUND, buffer); + dmadac[i] = devtag_get_device(machine, buffer); } /* Save state support */ diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index 592a358ce97..1326028d1bf 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -433,7 +433,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xf800, 0xf800) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -442,9 +442,9 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xf820, 0xf821) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xf800, 0xf800) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xf820, 0xf821) AM_DEVWRITE("ym2", ym2203_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* ?? */ ADDRESS_MAP_END @@ -455,8 +455,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( drgnbowl_sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 0db9bf66603..7a46fa70caa 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -915,7 +915,7 @@ static MACHINE_RESET( digdug ) static ADDRESS_MAP_START( bosco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */ AM_RANGE(0x6800, 0x6807) AM_READ(bosco_dsw_r) - AM_RANGE(0x6800, 0x681f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&namco_soundregs) + AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x6820, 0x6827) AM_WRITE(bosco_latch_w) /* misc latches */ AM_RANGE(0x6830, 0x6830) AM_WRITE(watchdog_reset_w) AM_RANGE(0x7000, 0x70ff) AM_READWRITE(namco_06xx_0_data_r, namco_06xx_0_data_w) @@ -937,7 +937,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( galaga_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */ AM_RANGE(0x6800, 0x6807) AM_READ(bosco_dsw_r) - AM_RANGE(0x6800, 0x681f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&namco_soundregs) + AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x6820, 0x6827) AM_WRITE(bosco_latch_w) /* misc latches */ AM_RANGE(0x6830, 0x6830) AM_WRITE(watchdog_reset_w) AM_RANGE(0x7000, 0x70ff) AM_READWRITE(namco_06xx_0_data_r, namco_06xx_0_data_w) @@ -954,7 +954,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( xevious_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */ AM_RANGE(0x6800, 0x6807) AM_READ(bosco_dsw_r) - AM_RANGE(0x6800, 0x681f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&namco_soundregs) + AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x6820, 0x6827) AM_WRITE(bosco_latch_w) /* misc latches */ AM_RANGE(0x6830, 0x6830) AM_WRITE(watchdog_reset_w) AM_RANGE(0x7000, 0x70ff) AM_READWRITE(namco_06xx_0_data_r, namco_06xx_0_data_w) @@ -974,7 +974,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( digdug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */ - AM_RANGE(0x6800, 0x681f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&namco_soundregs) + AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x6820, 0x6827) AM_WRITE(bosco_latch_w) /* misc latches */ AM_RANGE(0x6830, 0x6830) AM_WRITE(watchdog_reset_w) AM_RANGE(0x7000, 0x70ff) AM_READWRITE(namco_06xx_0_data_r, namco_06xx_0_data_w) @@ -985,8 +985,8 @@ static ADDRESS_MAP_START( digdug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x93ff) AM_RAM AM_SHARE(3) AM_BASE(&digdug_posram) /* work RAM + sprite registers */ AM_RANGE(0x9800, 0x9bff) AM_RAM AM_SHARE(4) AM_BASE(&digdug_flpram) /* work RAM + sprite registers */ AM_RANGE(0xa000, 0xa007) AM_READNOP AM_WRITE(digdug_PORT_w) /* video latches (spurious reads when setting latch bits) */ - AM_RANGE(0xb800, 0xb83f) AM_DEVREADWRITE(ATARIVGEAROM, "earom", atari_vg_earom_r, atari_vg_earom_w) /* non volatile memory data */ - AM_RANGE(0xb840, 0xb840) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) /* non volatile memory control */ + AM_RANGE(0xb800, 0xb83f) AM_DEVREADWRITE("earom", atari_vg_earom_r, atari_vg_earom_w) /* non volatile memory data */ + AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) /* non volatile memory control */ ADDRESS_MAP_END diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 2c7422b7174..3706694cb5f 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -242,7 +242,7 @@ static ADDRESS_MAP_START( galaxi_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x500002, 0x500003 ) AM_WRITE( galaxi_500002_w ) AM_RANGE( 0x500004, 0x500005 ) AM_WRITE( galaxi_500004_w ) - AM_RANGE( 0x700000, 0x700001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x700000, 0x700001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE( 0x600000, 0x607fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size ) // 2x DS1230Y (non volatile SRAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 27f0f1b8601..0890cb12891 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -337,8 +337,8 @@ static READ8_HANDLER( konami_ay8910_r ) { /* the decoding here is very simplistic, and you can address both simultaneously */ UINT8 result = 0xff; - if (offset & 0x20) result &= ay8910_r(devtag_get_device(space->machine, SOUND, "8910.1"), 0); - if (offset & 0x80) result &= ay8910_r(devtag_get_device(space->machine, SOUND, "8910.0"), 0); + if (offset & 0x20) result &= ay8910_r(devtag_get_device(space->machine, "8910.1"), 0); + if (offset & 0x80) result &= ay8910_r(devtag_get_device(space->machine, "8910.0"), 0); return result; } @@ -348,14 +348,14 @@ static WRITE8_HANDLER( konami_ay8910_w ) /* AV 4,5 ==> AY8910 #2 */ /* the decoding here is very simplistic, and you can address two simultaneously */ if (offset & 0x10) - ay8910_address_w(devtag_get_device(space->machine, SOUND, "8910.1"), 0, data); + ay8910_address_w(devtag_get_device(space->machine, "8910.1"), 0, data); else if (offset & 0x20) - ay8910_data_w(devtag_get_device(space->machine, SOUND, "8910.1"), 0, data); + ay8910_data_w(devtag_get_device(space->machine, "8910.1"), 0, data); /* AV6,7 ==> AY8910 #1 */ if (offset & 0x40) - ay8910_address_w(devtag_get_device(space->machine, SOUND, "8910.0"), 0, data); + ay8910_address_w(devtag_get_device(space->machine, "8910.0"), 0, data); else if (offset & 0x80) - ay8910_data_w(devtag_get_device(space->machine, SOUND, "8910.0"), 0, data); + ay8910_data_w(devtag_get_device(space->machine, "8910.0"), 0, data); } @@ -411,7 +411,7 @@ static READ8_DEVICE_HANDLER( konami_sound_timer_r ) static WRITE8_HANDLER( konami_sound_filter_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "konami"); + const device_config *discrete = devtag_get_device(space->machine, "konami"); static const char *ayname[2] = { "8910.0", "8910.1" }; int which, chan; @@ -419,7 +419,7 @@ static WRITE8_HANDLER( konami_sound_filter_w ) /* AV0 .. AV5 ==> AY8910 #2 */ /* AV6 .. AV11 ==> AY8910 #1 */ for (which = 0; which < 2; which++) - if (devtag_get_device(space->machine, SOUND, ayname[which]) != NULL) + if (devtag_get_device(space->machine, ayname[which]) != NULL) for (chan = 0; chan < 3; chan++) { UINT8 bits = (offset >> (2 * chan + 6 * (1 - which))) & 3; @@ -476,8 +476,8 @@ static READ8_HANDLER( theend_ppi8255_r ) { /* the decoding here is very simplistic, and you can address both simultaneously */ UINT8 result = 0xff; - if (offset & 0x0100) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset & 3); - if (offset & 0x0200) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3); + if (offset & 0x0100) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), offset & 3); + if (offset & 0x0200) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), offset & 3); return result; } @@ -485,8 +485,8 @@ static READ8_HANDLER( theend_ppi8255_r ) static WRITE8_HANDLER( theend_ppi8255_w ) { /* the decoding here is very simplistic, and you can address both simultaneously */ - if (offset & 0x0100) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset & 3, data); - if (offset & 0x0200) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3, data); + if (offset & 0x0100) ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), offset & 3, data); + if (offset & 0x0200) ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), offset & 3, data); } @@ -597,7 +597,7 @@ static READ8_HANDLER( sfx_sample_io_r ) { /* the decoding here is very simplistic, and you can address both simultaneously */ UINT8 result = 0xff; - if (offset & 0x04) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_2"), offset & 3); + if (offset & 0x04) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_2"), offset & 3); return result; } @@ -605,8 +605,8 @@ static READ8_HANDLER( sfx_sample_io_r ) static WRITE8_HANDLER( sfx_sample_io_w ) { /* the decoding here is very simplistic, and you can address both simultaneously */ - if (offset & 0x04) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_2"), offset & 3, data); - if (offset & 0x10) dac_signed_data_w(devtag_get_device(space->machine, SOUND, "dac"), data); + if (offset & 0x04) ppi8255_w(devtag_get_device(space->machine, "ppi8255_2"), offset & 3, data); + if (offset & 0x10) dac_signed_data_w(devtag_get_device(space->machine, "dac"), data); } @@ -644,8 +644,8 @@ static READ8_HANDLER( frogger_ppi8255_r ) { /* the decoding here is very simplistic, and you can address both simultaneously */ UINT8 result = 0xff; - if (offset & 0x1000) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), (offset >> 1) & 3); - if (offset & 0x2000) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), (offset >> 1) & 3); + if (offset & 0x1000) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), (offset >> 1) & 3); + if (offset & 0x2000) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), (offset >> 1) & 3); return result; } @@ -653,8 +653,8 @@ static READ8_HANDLER( frogger_ppi8255_r ) static WRITE8_HANDLER( frogger_ppi8255_w ) { /* the decoding here is very simplistic, and you can address both simultaneously */ - if (offset & 0x1000) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), (offset >> 1) & 3, data); - if (offset & 0x2000) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), (offset >> 1) & 3, data); + if (offset & 0x1000) ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), (offset >> 1) & 3, data); + if (offset & 0x2000) ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), (offset >> 1) & 3, data); } @@ -662,7 +662,7 @@ static READ8_HANDLER( frogger_ay8910_r ) { /* the decoding here is very simplistic */ UINT8 result = 0xff; - if (offset & 0x40) result &= ay8910_r(devtag_get_device(space->machine, SOUND, "8910.0"), 0); + if (offset & 0x40) result &= ay8910_r(devtag_get_device(space->machine, "8910.0"), 0); return result; } @@ -672,9 +672,9 @@ static WRITE8_HANDLER( frogger_ay8910_w ) /* the decoding here is very simplistic */ /* AV6,7 ==> AY8910 #1 */ if (offset & 0x40) - ay8910_data_w(devtag_get_device(space->machine, SOUND, "8910.0"), 0, data); + ay8910_data_w(devtag_get_device(space->machine, "8910.0"), 0, data); else if (offset & 0x80) - ay8910_address_w(devtag_get_device(space->machine, SOUND, "8910.0"), 0, data); + ay8910_address_w(devtag_get_device(space->machine, "8910.0"), 0, data); } @@ -703,8 +703,8 @@ static READ8_HANDLER( frogf_ppi8255_r ) { /* the decoding here is very simplistic, and you can address both simultaneously */ UINT8 result = 0xff; - if (offset & 0x1000) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), (offset >> 3) & 3); - if (offset & 0x2000) result &= ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), (offset >> 3) & 3); + if (offset & 0x1000) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), (offset >> 3) & 3); + if (offset & 0x2000) result &= ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), (offset >> 3) & 3); return result; } @@ -712,8 +712,8 @@ static READ8_HANDLER( frogf_ppi8255_r ) static WRITE8_HANDLER( frogf_ppi8255_w ) { /* the decoding here is very simplistic, and you can address both simultaneously */ - if (offset & 0x1000) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), (offset >> 3) & 3, data); - if (offset & 0x2000) ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), (offset >> 3) & 3, data); + if (offset & 0x1000) ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), (offset >> 3) & 3, data); + if (offset & 0x2000) ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), (offset >> 3) & 3, data); } @@ -724,10 +724,10 @@ static WRITE8_HANDLER( frogf_ppi8255_w ) * *************************************/ -static READ8_HANDLER( turtles_ppi8255_0_r ) { return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), (offset >> 4) & 3); } -static READ8_HANDLER( turtles_ppi8255_1_r ) { return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), (offset >> 4) & 3); } -static WRITE8_HANDLER( turtles_ppi8255_0_w ) { ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), (offset >> 4) & 3, data); } -static WRITE8_HANDLER( turtles_ppi8255_1_w ) { ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), (offset >> 4) & 3, data); } +static READ8_HANDLER( turtles_ppi8255_0_r ) { return ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), (offset >> 4) & 3); } +static READ8_HANDLER( turtles_ppi8255_1_r ) { return ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), (offset >> 4) & 3); } +static WRITE8_HANDLER( turtles_ppi8255_0_w ) { ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), (offset >> 4) & 3, data); } +static WRITE8_HANDLER( turtles_ppi8255_1_w ) { ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), (offset >> 4) & 3, data); } @@ -741,9 +741,9 @@ static READ8_HANDLER( scorpion_ay8910_r ) { /* the decoding here is very simplistic, and you can address both simultaneously */ UINT8 result = 0xff; - if (offset & 0x08) result &= ay8910_r(devtag_get_device(space->machine, SOUND, "8910.2"), 0); - if (offset & 0x20) result &= ay8910_r(devtag_get_device(space->machine, SOUND, "8910.0"), 0); - if (offset & 0x80) result &= ay8910_r(devtag_get_device(space->machine, SOUND, "8910.1"), 0); + if (offset & 0x08) result &= ay8910_r(devtag_get_device(space->machine, "8910.2"), 0); + if (offset & 0x20) result &= ay8910_r(devtag_get_device(space->machine, "8910.0"), 0); + if (offset & 0x80) result &= ay8910_r(devtag_get_device(space->machine, "8910.1"), 0); return result; } @@ -751,12 +751,12 @@ static READ8_HANDLER( scorpion_ay8910_r ) static WRITE8_HANDLER( scorpion_ay8910_w ) { /* the decoding here is very simplistic, and you can address all six simultaneously */ - if (offset & 0x04) ay8910_address_w(devtag_get_device(space->machine, SOUND, "8910.2"), 0, data); - if (offset & 0x08) ay8910_data_w(devtag_get_device(space->machine, SOUND, "8910.2"), 0, data); - if (offset & 0x10) ay8910_address_w(devtag_get_device(space->machine, SOUND, "8910.0"), 0, data); - if (offset & 0x20) ay8910_data_w(devtag_get_device(space->machine, SOUND, "8910.0"), 0, data); - if (offset & 0x40) ay8910_address_w(devtag_get_device(space->machine, SOUND, "8910.1"), 0, data); - if (offset & 0x80) ay8910_data_w(devtag_get_device(space->machine, SOUND, "8910.1"), 0, data); + if (offset & 0x04) ay8910_address_w(devtag_get_device(space->machine, "8910.2"), 0, data); + if (offset & 0x08) ay8910_data_w(devtag_get_device(space->machine, "8910.2"), 0, data); + if (offset & 0x10) ay8910_address_w(devtag_get_device(space->machine, "8910.0"), 0, data); + if (offset & 0x20) ay8910_data_w(devtag_get_device(space->machine, "8910.0"), 0, data); + if (offset & 0x40) ay8910_address_w(devtag_get_device(space->machine, "8910.1"), 0, data); + if (offset & 0x80) ay8910_data_w(devtag_get_device(space->machine, "8910.1"), 0, data); } @@ -791,7 +791,7 @@ static WRITE8_DEVICE_HANDLER( scorpion_protection_w ) static READ8_HANDLER( scorpion_digitalker_intr_r ) { - const device_config *digitalker = devtag_get_device(space->machine, SOUND, "digitalker"); + const device_config *digitalker = devtag_get_device(space->machine, "digitalker"); return digitalker_0_intr_r(digitalker); } @@ -871,7 +871,7 @@ static WRITE8_HANDLER( zigzag_ay8910_w ) /* bit 0 = WRITE */ /* bit 1 = C/D */ if ((offset & 1) != 0) - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay"), offset >> 1, zigzag_ay8910_latch); + ay8910_data_address_w(devtag_get_device(space->machine, "ay"), offset >> 1, zigzag_ay8910_latch); break; case 0x100: @@ -963,21 +963,21 @@ static WRITE8_HANDLER( mshuttle_ay8910_cs_w ) static WRITE8_HANDLER( mshuttle_ay8910_control_w ) { if (!mshuttle_ay8910_cs) - ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay"), offset, data); + ay8910_address_w(devtag_get_device(space->machine, "ay"), offset, data); } static WRITE8_HANDLER( mshuttle_ay8910_data_w ) { if (!mshuttle_ay8910_cs) - ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay"), offset, data); + ay8910_data_w(devtag_get_device(space->machine, "ay"), offset, data); } static READ8_HANDLER( mshuttle_ay8910_data_r ) { if (!mshuttle_ay8910_cs) - return ay8910_r(devtag_get_device(space->machine, SOUND, "ay"), offset); + return ay8910_r(devtag_get_device(space->machine, "ay"), offset); return 0xff; } @@ -1263,8 +1263,8 @@ static ADDRESS_MAP_START( scobra_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x4000) AM_RAM AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x4400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x4700) AM_RAM_WRITE(galaxian_objram_w) AM_BASE(&spriteram) - AM_RANGE(0x9800, 0x9803) AM_MIRROR(0x47fc) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x47fc) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x9800, 0x9803) AM_MIRROR(0x47fc) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x47fc) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xa801, 0xa801) AM_MIRROR(0x47f8) AM_WRITE(irq_enable_w) AM_RANGE(0xa802, 0xa802) AM_MIRROR(0x47f8) AM_WRITE(coin_count_0_w) AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x47f8) AM_WRITE(scramble_background_enable_w) @@ -1350,8 +1350,8 @@ static ADDRESS_MAP_START( jumpbug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(&videoram) AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_BASE(&spriteram) - AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0") AM_RANGE(0x6002, 0x6006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_gfxbank_w) AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1") @@ -1456,8 +1456,8 @@ static ADDRESS_MAP_START( checkman_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x03, 0x03) AM_READ(soundlatch_r) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END @@ -1466,8 +1466,8 @@ static ADDRESS_MAP_START( checkmaj_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xa002, 0xa002) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xa002, 0xa002) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END @@ -1482,7 +1482,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kingball_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_READ(soundlatch_r) AM_DEVWRITE(SOUND, "dac", kingball_dac_w) + AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_READ(soundlatch_r) AM_DEVWRITE("dac", kingball_dac_w) ADDRESS_MAP_END @@ -1625,8 +1625,8 @@ static const ay8910_interface scorpion_ay8910_interface = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "digitalker", digitalker_data_w), - DEVCB_DEVICE_HANDLER(SOUND, "digitalker", scorpion_digitalker_control_w) + DEVCB_DEVICE_HANDLER("digitalker", digitalker_data_w), + DEVCB_DEVICE_HANDLER("digitalker", scorpion_digitalker_control_w) }; static const ay8910_interface checkmaj_ay8910_interface = diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index ace87cfc431..e52acc60b90 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -712,7 +712,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ozon1_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( drivfrcg, ADDRESS_SPACE_PROGRAM, 8 ) @@ -763,8 +763,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bongo_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END @@ -820,12 +820,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( harem_cpu2_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x08, 0x08) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "ay3", ay8910_address_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "ay3", ay8910_data_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x08, 0x08) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("ay3", ay8910_address_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay3", ay8910_data_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -875,9 +875,9 @@ static ADDRESS_MAP_START( racknrol, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( racknrol_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x1d, 0x1d) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x1e, 0x1e) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x1f, 0x1f) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x1d, 0x1d) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x1e, 0x1e) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x1f, 0x1f) AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_BASE(&racknrol_tiles_bank) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END @@ -967,7 +967,7 @@ static READ8_HANDLER( hexpoola_data_port_r ) static ADDRESS_MAP_START( hexpoola_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READNOP AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_BASE(&racknrol_tiles_bank) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE("sn", sn76496_w) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 35e8867cb97..a6a64c3c24a 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -165,9 +165,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym3526_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "dac1", dac_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "dac2", dac_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac2", dac_w) /* 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 diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 1be0c5a9b0b..76f615762e6 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -253,10 +253,10 @@ static ADDRESS_MAP_START( galpani2_mem1, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x780002, 0x780003) AM_READ_PORT("DSW2_P2") AM_RANGE(0x780004, 0x780005) AM_READ_PORT("SPECIAL") AM_RANGE(0x780006, 0x780007) AM_READ_PORT("SERVICE") - AM_RANGE(0xc00000, 0xc00001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff ) // 2 x OKIM6295 - AM_RANGE(0xc40000, 0xc40001) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff ) // + AM_RANGE(0xc00000, 0xc00001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff ) // 2 x OKIM6295 + AM_RANGE(0xc40000, 0xc40001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff ) // AM_RANGE(0xc80000, 0xc80001) AM_WRITE(galpani2_oki_0_bank_w ) // - AM_RANGE(0xcc0000, 0xcc0001) AM_DEVWRITE(SOUND, "oki2", galpani2_oki_1_bank_w ) // + AM_RANGE(0xcc0000, 0xcc0001) AM_DEVWRITE("oki2", galpani2_oki_1_bank_w ) // ADDRESS_MAP_END diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 9a28e951a90..1a6b220bacb 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -889,7 +889,7 @@ static ADDRESS_MAP_START( galpani3_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf00012, 0xf00013) AM_READ_PORT("P2") AM_RANGE(0xf00014, 0xf00015) AM_READ_PORT("COIN") AM_RANGE(0xf00016, 0xf00017) AM_NOP // ? read, but overwritten - AM_RANGE(0xf00020, 0xf00023) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // sound + AM_RANGE(0xf00020, 0xf00023) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // sound AM_RANGE(0xf00040, 0xf00041) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // watchdog AM_RANGE(0xf00050, 0xf00051) AM_NOP // ? written once (3rd opcode, $30.b) ADDRESS_MAP_END diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index 52b38f7c70a..ceb6c0819a8 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -219,7 +219,7 @@ static WRITE16_HANDLER( galpanic_bgvideoram_mirror_w ) static ADDRESS_MAP_START( galpanic, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x3fffff) AM_ROM - AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) 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 */ @@ -266,8 +266,8 @@ static ADDRESS_MAP_START( comad_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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(SMH_RAM) /* missw96 */ AM_RANGE(0xc80000, 0xc8ffff) AM_READ(SMH_RAM) /* fantasia, newfant */ - AM_RANGE(0xf00000, 0xf00001) AM_DEVREAD8(SOUND, "oki", comad_okim6295_r, 0xff00) /* fantasia, missw96 */ - AM_RANGE(0xf80000, 0xf80001) AM_DEVREAD8(SOUND, "oki", comad_okim6295_r, 0xff00) /* newfant */ + AM_RANGE(0xf00000, 0xf00001) AM_DEVREAD8("oki", comad_okim6295_r, 0xff00) /* fantasia, missw96 */ + AM_RANGE(0xf80000, 0xf80001) AM_DEVREAD8("oki", comad_okim6295_r, 0xff00) /* newfant */ ADDRESS_MAP_END static ADDRESS_MAP_START( comad_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -279,8 +279,8 @@ static ADDRESS_MAP_START( comad_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) /* not sure */ AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) /* missw96 */ AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(SMH_RAM) /* fantasia, newfant */ - AM_RANGE(0xf00000, 0xf00001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) /* fantasia, missw96 */ - AM_RANGE(0xf80000, 0xf80001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) /* newfant */ + AM_RANGE(0xf00000, 0xf00001) AM_DEVWRITE8("oki", okim6295_w, 0xff00) /* fantasia, missw96 */ + AM_RANGE(0xf80000, 0xf80001) AM_DEVWRITE8("oki", okim6295_w, 0xff00) /* newfant */ ADDRESS_MAP_END static ADDRESS_MAP_START( fantsia2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -295,7 +295,7 @@ static ADDRESS_MAP_START( fantsia2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) // 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(SMH_RAM) - AM_RANGE(0xc80000, 0xc80001) AM_DEVREAD8(SOUND, "oki", comad_okim6295_r, 0xff00) + AM_RANGE(0xc80000, 0xc80001) AM_DEVREAD8("oki", comad_okim6295_r, 0xff00) ADDRESS_MAP_END static ADDRESS_MAP_START( fantsia2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -307,7 +307,7 @@ static ADDRESS_MAP_START( fantsia2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) /* not sure */ AM_RANGE(0xf80000, 0xf8ffff) AM_WRITE(SMH_RAM) AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* coin counters, + ? */ - AM_RANGE(0xc80000, 0xc80001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) + AM_RANGE(0xc80000, 0xc80001) AM_DEVWRITE8("oki", okim6295_w, 0xff00) ADDRESS_MAP_END @@ -323,7 +323,7 @@ static ADDRESS_MAP_START( galhustl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_READ_PORT("DSW1_P1") AM_RANGE(0x800002, 0x800003) AM_READ_PORT("DSW2_P2") AM_RANGE(0x800004, 0x800005) AM_READ_PORT("SYSTEM") - AM_RANGE(0xd00000, 0xd00001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0xff00) + AM_RANGE(0xd00000, 0xd00001) AM_DEVREAD8("oki", okim6295_r, 0xff00) AM_RANGE(0xe80000, 0xe8ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -339,7 +339,7 @@ static ADDRESS_MAP_START( galhustl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) + AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE8("oki", okim6295_w, 0xff00) AM_RANGE(0xe80000, 0xe8ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -363,7 +363,7 @@ static ADDRESS_MAP_START( zipzap_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800002, 0x800003) AM_READ_PORT("DSW2_P2") AM_RANGE(0x800004, 0x800005) AM_READ_PORT("SYSTEM") - AM_RANGE(0xc00000, 0xc00001) AM_DEVREAD8(SOUND, "oki", comad_okim6295_r, 0xff00) + AM_RANGE(0xc00000, 0xc00001) AM_DEVREAD8("oki", comad_okim6295_r, 0xff00) AM_RANGE(0xc80000, 0xc8ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -379,7 +379,7 @@ static ADDRESS_MAP_START( zipzap_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) + AM_RANGE(0xc00000, 0xc00001) AM_DEVWRITE8("oki", okim6295_w, 0xff00) AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(SMH_RAM) // main ram ADDRESS_MAP_END @@ -398,7 +398,7 @@ static ADDRESS_MAP_START( supmodel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800006, 0x800007) AM_READ(kludge) AM_RANGE(0x800008, 0x800009) AM_READ(kludge) AM_RANGE(0xc80000, 0xc8ffff) AM_READ(SMH_RAM) - AM_RANGE(0xf80000, 0xf80001) AM_DEVREAD8(SOUND, "oki", comad_okim6295_r, 0xff00) + AM_RANGE(0xf80000, 0xf80001) AM_DEVREAD8("oki", comad_okim6295_r, 0xff00) ADDRESS_MAP_END static ADDRESS_MAP_START( supmodel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -416,7 +416,7 @@ static ADDRESS_MAP_START( supmodel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0xff00) + AM_RANGE(0xf80000, 0xf80001) AM_DEVWRITE8("oki", okim6295_w, 0xff00) ADDRESS_MAP_END #define COMMON_COIN0\ diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index fc97bcf698e..c36e51da5b7 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -71,8 +71,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym", ym3812_w) 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/gamecstl.c b/src/mame/drivers/gamecstl.c index 2996522eaf1..2dd40b32ecd 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -491,22 +491,22 @@ static ADDRESS_MAP_START( gamecstl_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START(gamecstl_io, ADDRESS_SPACE_IO, 32) - AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8(DMA8237, "dma8237_1", dma8237_r, dma8237_w, 0xffffffff) - AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8(PIC8259, "pic8259_1", pic8259_r, pic8259_w, 0xffffffff) - AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8(PIT8254, "pit8254", pit8253_r, pit8253_w, 0xffffffff) + AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", dma8237_r, dma8237_w, 0xffffffff) + AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff) + AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff) AM_RANGE(0x0060, 0x006f) AM_READWRITE(kbdc8042_32le_r, kbdc8042_32le_w) AM_RANGE(0x0070, 0x007f) AM_READWRITE(mc146818_port32le_r, mc146818_port32le_w) AM_RANGE(0x0080, 0x009f) AM_READWRITE(at_page32_r, at_page32_w) - AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8(PIC8259, "pic8259_2", pic8259_r, pic8259_w, 0xffffffff) - AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE(DMA8237, "dma8237_2", at32_dma8237_2_r, at32_dma8237_2_w) + AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8("pic8259_2", pic8259_r, pic8259_w, 0xffffffff) + AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE("dma8237_2", at32_dma8237_2_r, at32_dma8237_2_w) AM_RANGE(0x00e8, 0x00eb) AM_NOP - AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_r, ide_w) + AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE("ide", ide_r, ide_w) AM_RANGE(0x0300, 0x03af) AM_NOP AM_RANGE(0x03b0, 0x03df) AM_NOP AM_RANGE(0x0278, 0x027b) AM_WRITE(pnp_config_w) - AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", fdc_r, fdc_w) + AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE("ide", fdc_r, fdc_w) AM_RANGE(0x0a78, 0x0a7b) AM_WRITE(pnp_data_w) - AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE(PCI_BUS, "pcibus", pci_32le_r, pci_32le_w) + AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_32le_r, pci_32le_w) ADDRESS_MAP_END /*****************************************************************************/ @@ -580,11 +580,11 @@ static IRQ_CALLBACK(irq_callback) static MACHINE_START(gamecstl) { - gamecstl_devices.pit8254 = device_list_find_by_tag( machine->config->devicelist, PIT8254, "pit8254" ); - gamecstl_devices.pic8259_1 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_1" ); - gamecstl_devices.pic8259_2 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_2" ); - gamecstl_devices.dma8237_1 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_1" ); - gamecstl_devices.dma8237_2 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_2" ); + gamecstl_devices.pit8254 = devtag_get_device( machine, "pit8254" ); + gamecstl_devices.pic8259_1 = devtag_get_device( machine, "pic8259_1" ); + gamecstl_devices.pic8259_2 = devtag_get_device( machine, "pic8259_2" ); + gamecstl_devices.dma8237_1 = devtag_get_device( machine, "dma8237_1" ); + gamecstl_devices.dma8237_2 = devtag_get_device( machine, "dma8237_2" ); } static MACHINE_RESET(gamecstl) @@ -659,8 +659,8 @@ static MACHINE_DRIVER_START(gamecstl) MDRV_MACHINE_RESET(gamecstl) MDRV_PCI_BUS_ADD("pcibus", 0) - MDRV_PCI_BUS_DEVICE(0, NULL, NULL, intel82439tx_pci_r, intel82439tx_pci_w) - MDRV_PCI_BUS_DEVICE(7, NULL, NULL, intel82371ab_pci_r, intel82371ab_pci_w) + MDRV_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w) + MDRV_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w) MDRV_PIT8254_ADD( "pit8254", gamecstl_pit8254_config ) diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index eaac0e0cf6d..46e9890b66d 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -205,7 +205,7 @@ static MACHINE_START( gameplan ) { gameplan_state *state = machine->driver_data; - state->riot = device_list_find_by_tag(machine->config->devicelist, RIOT6532, "riot"); + state->riot = devtag_get_device(machine, "riot"); /* register for save states */ state_save_register_global(machine, state->current_port); @@ -233,9 +233,9 @@ static MACHINE_RESET( gameplan ) static ADDRESS_MAP_START( gameplan_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM - AM_RANGE(0x2000, 0x200f) AM_MIRROR(0x07f0) AM_DEVREADWRITE(VIA6522, "via6522_0", via_r, via_w) /* VIA 1 */ - AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x07f0) AM_DEVREADWRITE(VIA6522, "via6522_1", via_r, via_w) /* VIA 2 */ - AM_RANGE(0x3000, 0x300f) AM_MIRROR(0x07f0) AM_DEVREADWRITE(VIA6522, "via6522_2", via_r, via_w) /* VIA 3 */ + AM_RANGE(0x2000, 0x200f) AM_MIRROR(0x07f0) AM_DEVREADWRITE("via6522_0", via_r, via_w) /* VIA 1 */ + AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x07f0) AM_DEVREADWRITE("via6522_1", via_r, via_w) /* VIA 2 */ + AM_RANGE(0x3000, 0x300f) AM_MIRROR(0x07f0) AM_DEVREADWRITE("via6522_2", via_r, via_w) /* VIA 3 */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -249,10 +249,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gameplan_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM /* 6532 internal RAM */ - AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_ROM ADDRESS_MAP_END @@ -260,10 +260,10 @@ ADDRESS_MAP_END /* same as Gameplan, but larger ROM */ static ADDRESS_MAP_START( leprechn_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM /* 6532 internal RAM */ - AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0xe000, 0xefff) AM_MIRROR(0x1000) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index a52085656cb..e57d79e74f8 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -282,7 +282,7 @@ static WRITE8_HANDLER( gaplus_sreset_w ) int bit = !BIT(offset,11); cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); - mappy_sound_enable(devtag_get_device(space->machine, SOUND, "namco"), bit); + mappy_sound_enable(devtag_get_device(space->machine, "namco"), bit); } static WRITE8_HANDLER( gaplus_freset_w ) @@ -323,7 +323,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(gaplus_videoram_w) AM_BASE(&gaplus_videoram) /* tilemap RAM (shared with CPU #2) */ AM_RANGE(0x0800, 0x1fff) AM_WRITE(gaplus_spriteram_w) AM_BASE(&gaplus_spriteram) /* shared RAM with CPU #2 (includes sprite RAM) */ - AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE(SOUND, "namco", gaplus_snd_sharedram_w) /* shared RAM with CPU #3 */ + AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE("namco", gaplus_snd_sharedram_w) /* shared RAM with CPU #3 */ AM_RANGE(0x6820, 0x682f) AM_WRITE(gaplus_customio_3_w) AM_BASE(&gaplus_customio_3)/* custom I/O chip #3 interface */ AM_RANGE(0x6800, 0x6bff) AM_WRITE(namcoio_w) /* custom I/O chips interface */ AM_RANGE(0x7000, 0x7fff) AM_WRITE(gaplus_irq_1_ctrl_w) /* main CPU irq control */ @@ -355,7 +355,7 @@ ADDRESS_MAP_END /* CPU 3 (SOUND CPU) write addresses */ static ADDRESS_MAP_START( writemem_cpu3, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_DEVWRITE(SOUND, "namco", gaplus_snd_sharedram_w) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ + AM_RANGE(0x0000, 0x03ff) AM_DEVWRITE("namco", 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(SMH_ROM) /* ROM */ diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index 50a6d03df61..bd92e107142 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -346,13 +346,13 @@ static ADDRESS_MAP_START( gat_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(gat_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* PSG */ + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn", sn76496_w) /* PSG */ AM_RANGE(0xe000, 0xe000) AM_WRITE(output_port_0_w) /* lamps */ ADDRESS_MAP_END static ADDRESS_MAP_START( gat_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 1211c785797..54c16cc9aa8 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -231,7 +231,7 @@ static READ8_HANDLER( switch_6502_r ) if (atarigen_cpu_to_sound_ready) temp ^= 0x80; if (atarigen_sound_to_cpu_ready) temp ^= 0x40; - if (tms5220_ready_r(devtag_get_device(space->machine, SOUND, "tms"))) temp ^= 0x20; + if (tms5220_ready_r(devtag_get_device(space->machine, "tms"))) temp ^= 0x20; if (!(input_port_read(space->machine, "803008") & 0x0008)) temp ^= 0x10; return temp; @@ -260,7 +260,7 @@ static WRITE8_HANDLER( tms5220_w ) static WRITE8_HANDLER( sound_ctl_w ) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); switch (offset & 7) { case 0: /* music reset, bit D7, low reset */ @@ -356,8 +356,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1010, 0x101f) AM_MIRROR(0x27c0) AM_READ(atarigen_6502_sound_r) AM_RANGE(0x1020, 0x102f) AM_MIRROR(0x27c0) AM_READ_PORT("COIN") AM_WRITE(mixer_w) AM_RANGE(0x1030, 0x103f) AM_MIRROR(0x27c0) AM_READWRITE(switch_6502_r, sound_ctl_w) - AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x27c0) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) - AM_RANGE(0x1810, 0x1811) AM_MIRROR(0x27ce) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x27c0) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) + AM_RANGE(0x1810, 0x1811) AM_MIRROR(0x27ce) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x1820, 0x182f) AM_MIRROR(0x27c0) AM_WRITE(tms5220_w) AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x27c0) AM_READWRITE(atarigen_6502_irq_ack_r, atarigen_6502_irq_ack_w) AM_RANGE(0x4000, 0xffff) AM_ROM diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index a96ac89c392..337cfa57782 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -159,7 +159,7 @@ static ADDRESS_MAP_START( gberet_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe044, 0xe044) AM_WRITE(gberet_flipscreen_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(gberet_coin_counter_w) AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") AM_WRITENOP // Loads the snd command into the snd latch - AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE(SOUND, "sn", sn76496_w) // This address triggers the SN chip to read the data port. + AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE("sn", sn76496_w) // This address triggers the SN chip to read the data port. AM_RANGE(0xf600, 0xf600) AM_READ_PORT("DSW1") AM_RANGE(0xf601, 0xf601) AM_READ_PORT("P2") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") @@ -179,7 +179,7 @@ static ADDRESS_MAP_START( gberetb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe900, 0xe9ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xf000) AM_WRITENOP // coin counter not supported AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("sn", sn76496_w) AM_RANGE(0xf600, 0xf600) AM_READ_PORT("P2") AM_RANGE(0xf601, 0xf601) AM_READ_PORT("DSW1") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") @@ -201,7 +201,7 @@ static ADDRESS_MAP_START( mrgoemon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe044, 0xe044) AM_WRITE(mrgoemon_flipscreen_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(mrgoemon_coin_counter_w) AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") AM_WRITENOP // Loads the snd command into the snd latch - AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE(SOUND, "sn", sn76496_w) // This address triggers the SN chip to read the data port. + AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW3") AM_DEVWRITE("sn", sn76496_w) // This address triggers the SN chip to read the data port. AM_RANGE(0xf600, 0xf600) AM_READ_PORT("DSW1") AM_WRITE(watchdog_reset_w) AM_RANGE(0xf601, 0xf601) AM_READ_PORT("P2") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index de803da94bf..9cdb5197cb8 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -153,16 +153,16 @@ static ADDRESS_MAP_START( gbusters_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami", k007232_r) /* 007232 registers */ - AM_RANGE(0xc001, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_status_port_r) /* YM 2151 */ + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami", k007232_r) /* 007232 registers */ + AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ym", ym2151_status_port_r) /* YM 2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( gbusters_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "konami", k007232_w) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) /* YM 2151 */ - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE(SOUND, "konami", gbusters_snd_bankswitch_w) /* 007232 bankswitch? */ + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami", k007232_w) /* 007232 registers */ + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM 2151 */ + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", gbusters_snd_bankswitch_w) /* 007232 bankswitch? */ ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index f2642fe15ee..b9dd0208855 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -91,7 +91,7 @@ static READ16_HANDLER( ioc_r ) case 0x50: case 0x51: - return okim6295_r(devtag_get_device(space->machine, SOUND, "oki"),0)<<8; + return okim6295_r(devtag_get_device(space->machine, "oki"),0)<<8; } @@ -148,7 +148,7 @@ static WRITE16_HANDLER( ioc_w ) // OKIM6295 case 0x50: case 0x51: - okim6295_w(devtag_get_device(space->machine, SOUND, "oki"), 0, data>>8); + okim6295_w(devtag_get_device(space->machine, "oki"), 0, data>>8); break; // MSM6585 ADPCM - mini emulation diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c index f42b53cbab8..4c631bb4cce 100644 --- a/src/mame/drivers/genesis.c +++ b/src/mame/drivers/genesis.c @@ -256,7 +256,7 @@ READ16_HANDLER ( genesis_68k_to_z80_r ) { if (ACCESSING_BITS_0_7) offset += 1; - return ym3438_r(devtag_get_device(space->machine, SOUND, "ym"), offset); + return ym3438_r(devtag_get_device(space->machine, "ym"), offset); } /* Bank Register */ @@ -308,7 +308,7 @@ READ16_HANDLER ( megaplay_68k_to_z80_r ) { if (ACCESSING_BITS_0_7) offset += 1; - return ym3438_r(devtag_get_device(space->machine, SOUND, "ym"), offset); + return ym3438_r(devtag_get_device(space->machine, "ym"), offset); } /* Bank Register */ @@ -350,7 +350,7 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w ) /* YM2612 */ if ((offset >= 0x4000) && (offset <= 0x5fff)) { - const device_config *ym = devtag_get_device(space->machine, SOUND, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ym"); switch (offset & 3) { case 0: @@ -383,7 +383,7 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w ) if ( (offset >= 0x10) && (offset <=0x17) ) { - const device_config *sn = devtag_get_device(space->machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(space->machine, "sn"); if (ACCESSING_BITS_0_7) sn76496_w(sn, 0, data & 0xff); if (ACCESSING_BITS_8_15) sn76496_w(sn, 0, (data >>8) & 0xff); } @@ -512,7 +512,7 @@ READ8_HANDLER ( genesis_z80_r ) /* YM2610 */ if ((offset >= 0x4000) && (offset <= 0x5fff)) { - return ym3438_r(devtag_get_device(space->machine, SOUND, "ym"), offset); + return ym3438_r(devtag_get_device(space->machine, "ym"), offset); } /* Bank Register */ @@ -543,7 +543,7 @@ WRITE8_HANDLER ( genesis_z80_w ) /* YM2610 */ if ((offset >= 0x4000) && (offset <= 0x5fff)) { - ym3438_w(devtag_get_device(space->machine, SOUND, "ym"), offset & 3, data); + ym3438_w(devtag_get_device(space->machine, "ym"), offset & 3, data); } /* Bank Register */ diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index e045b115472..08a48451d97 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -151,7 +151,7 @@ static WRITE8_DEVICE_HANDLER( sound_w ) interrupt_enable_w(space, 0, data & 0x40); /* bit 7 goes directly to the sound amplifier */ - dac_data_w(devtag_get_device(device->machine, SOUND, "dac"), ((data & 0x80) >> 7) * 255); + dac_data_w(devtag_get_device(device->machine, "dac"), ((data & 0x80) >> 7) * 255); } static WRITE8_DEVICE_HANDLER( sound2_w ) @@ -168,7 +168,7 @@ static WRITE8_DEVICE_HANDLER( sound2_w ) set_led_status(12,data & 0x20); /* bit 7 goes directly to the sound amplifier */ - dac_data_w(devtag_get_device(device->machine, SOUND, "dac"), ((data & 0x80) >> 7) * 255); + dac_data_w(devtag_get_device(device->machine, "dac"), ((data & 0x80) >> 7) * 255); } static WRITE8_DEVICE_HANDLER( lamps2_w ) @@ -233,8 +233,8 @@ static ADDRESS_MAP_START( getrivia_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0x600f, 0x600f) AM_WRITE(banksel_5_1_w) AM_RANGE(0x6017, 0x6017) AM_WRITE(banksel_4_1_w) AM_RANGE(0x601b, 0x601b) AM_WRITE(banksel_3_1_w) @@ -259,8 +259,8 @@ static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4401, 0x4401) AM_WRITE(banksel_1_2_w) AM_RANGE(0x4402, 0x4402) AM_WRITE(banksel_2_1_w) AM_RANGE(0x4403, 0x4403) AM_WRITE(banksel_2_2_w) - AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0x8000, 0x8002) AM_WRITE(SMH_RAM) AM_BASE(&drawctrl) AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(getrivia_bitmap_w) AM_BASE(&videoram) ADDRESS_MAP_END @@ -270,8 +270,8 @@ static ADDRESS_MAP_START( amuse_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0x606f, 0x606f) AM_WRITE(banksel_5_1_w) AM_RANGE(0x6077, 0x6077) AM_WRITE(banksel_4_1_w) AM_RANGE(0x607b, 0x607b) AM_WRITE(banksel_3_1_w) @@ -286,8 +286,8 @@ static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0x60ef, 0x60ef) AM_WRITE(banksel_3_1_w) AM_RANGE(0x60f7, 0x60f7) AM_WRITE(banksel_2_2_w) AM_RANGE(0x60fb, 0x60fb) AM_WRITE(banksel_2_1_w) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index 7e83c426069..91791e684e9 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -250,14 +250,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xebff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) - AM_RANGE(0xf800, 0xfa2f) AM_DEVREAD(SOUND, "konami", k054539_r) + AM_RANGE(0xf800, 0xfa2f) AM_DEVREAD("konami", k054539_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(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf800, 0xfa2f) AM_DEVWRITE(SOUND, "konami", k054539_w) + AM_RANGE(0xf800, 0xfa2f) AM_DEVWRITE("konami", k054539_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 d4221b26425..bdc7f7b17bf 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -181,8 +181,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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 */ AM_RANGE(0x0803, 0x0803) AM_WRITE(MC6840_write_port_1_w) /* Takahiro Nogi. 1999/09/27 */ - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ym", y8950_w) - AM_RANGE(0x2800, 0x2801) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym", y8950_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index b0cca935eeb..2c4b67a9d7b 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -411,7 +411,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ppking_cpu2_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x20, 0x21) AM_READ(qx1_r) AM_WRITE(qx1_w) AM_RANGE(0x40, 0x40) AM_READ(SMH_NOP) AM_RANGE(0x60, 0x61) AM_READ(qx2_r) AM_WRITE(qx2_w) @@ -439,7 +439,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1000, 0x1fff) AM_DEVWRITE(SOUND, "msm", glad_adpcm_w) + AM_RANGE(0x1000, 0x1fff) AM_DEVWRITE("msm", glad_adpcm_w) AM_RANGE(0x2000, 0x2fff) AM_READ(glad_cpu_sound_command_r) AM_RANGE(0x4000, 0xffff) AM_ROMBANK(2) ADDRESS_MAP_END @@ -458,7 +458,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu2_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x20, 0x21) AM_READWRITE(TAITO8741_1_r, TAITO8741_1_w) AM_RANGE(0x40, 0x40) AM_NOP // WRITE(sub_irq_ack_w) AM_RANGE(0x60, 0x61) AM_READWRITE(TAITO8741_2_r, TAITO8741_2_w) diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index e0acfe15be4..73f1994c497 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -77,7 +77,7 @@ static ADDRESS_MAP_START( glass_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1") AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1") AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2") - AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff)/* OKI6295 status register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8("oki", okim6295_r, 0x00ff)/* OKI6295 status register */ AM_RANGE(0xfec000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( glass_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) /* OKI6295 data register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) /* OKI6295 data register */ AM_RANGE(0x70000a, 0x70004b) AM_WRITE(glass_coin_w) /* Coin Counters/Lockout */ 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 e40082a4553..90c0be1ac5e 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -106,8 +106,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xe002, 0xe003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("ym2", ym2203_w) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index c3794033629..6e110a5ddd0 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -73,7 +73,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( go2000_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "dac1", dac_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_w) AM_RANGE(0x03, 0x03) AM_WRITE(go2000_pcm_1_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 72e3fd67656..27adbdef591 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -106,10 +106,10 @@ static WRITE8_HANDLER( adpcm_data_w ) static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "msm", adpcm_control_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w) - AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 1e3251e6fdb..5c89a768908 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -139,7 +139,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index cbc2580f47b..aa2e8fd9096 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -880,10 +880,10 @@ static WRITE8_DEVICE_HANDLER( sound_w ) static ADDRESS_MAP_START( goldnpkr_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ - AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) - AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) + AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE("pia1", pia_r, pia_w) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(goldnpkr_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(goldnpkr_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4000, 0x7fff) AM_ROM @@ -892,10 +892,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pottnpkr_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ - AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) - AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) + AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE("pia1", pia_r, pia_w) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(goldnpkr_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(goldnpkr_colorram_w) AM_BASE(&colorram) AM_RANGE(0x2000, 0x3fff) AM_ROM @@ -904,10 +904,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( witchcrd_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ - AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) - AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) + AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x0848, 0x084b) AM_DEVREADWRITE("pia1", pia_r, pia_w) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(goldnpkr_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(goldnpkr_colorram_w) AM_BASE(&colorram) AM_RANGE(0x2000, 0x2000) AM_READ_PORT("SW2") @@ -2116,7 +2116,7 @@ static const pia6821_interface goldnpkr_pia1_intf = DEVCB_NULL, /* line CB1 in */ DEVCB_NULL, /* line CA2 in */ DEVCB_NULL, /* line CB2 in */ - DEVCB_DEVICE_HANDLER(SOUND, "discrete", sound_w), /* port A out */ + DEVCB_DEVICE_HANDLER("discrete", sound_w), /* port A out */ DEVCB_HANDLER(mux_w), /* port B out */ DEVCB_NULL, /* line CA2 out */ DEVCB_NULL, /* port CB2 out */ diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index ba05fc99341..99bef3fa848 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -175,10 +175,10 @@ static ADDRESS_MAP_START( goldstar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf810, 0xf810) AM_READ_PORT("UNK1") AM_RANGE(0xf811, 0xf811) AM_READ_PORT("UNK2") AM_RANGE(0xf820, 0xf820) AM_READ_PORT("DSW2") - AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xf840, 0xf840) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("ay", ay8910_address_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w) - AM_RANGE(0xfb00, 0xfb00) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xfb00, 0xfb00) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) 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 @@ -203,14 +203,14 @@ static ADDRESS_MAP_START( ncb3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf080, 0xf0bf) AM_RAM AM_BASE(&goldstar_reel2_scroll) AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(&goldstar_reel3_scroll) // moved compared to goldstar - AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xf810, 0xf813) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xf820, 0xf823) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ - AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xf840, 0xf840) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xf810, 0xf813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xf820, 0xf823) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ + AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xf840, 0xf840) AM_DEVWRITE("ay", ay8910_address_w) // AM_RANGE(0xf850, 0xf850) AM_WRITE(ncb3_p1_flip_w) // need flip? // AM_RANGE(0xf860, 0xf860) AM_WRITE(ncb3_p2_flip_w) // need flip? - AM_RANGE(0xf870, 0xf870) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* guess... device is initialized, but doesn't seems to be used.*/ + AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("sn", sn76496_w) /* guess... device is initialized, but doesn't seems to be used.*/ ADDRESS_MAP_END static ADDRESS_MAP_START( ncb3_readwriteport, ADDRESS_SPACE_IO, 8 ) @@ -283,10 +283,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cm_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) - AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ // AM_RANGE(0x11, 0x11) AM_WRITENOP AM_RANGE(0x12, 0x12) AM_WRITE (cm_outport1_w) /* output port */ @@ -296,32 +296,32 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cmast91_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ - AM_RANGE(0x21, 0x21) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x22, 0x23) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ + AM_RANGE(0x21, 0x21) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x22, 0x23) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( amcoe1_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) - AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ AM_RANGE(0x11, 0x11) AM_WRITENOP AM_RANGE(0x12, 0x12) AM_WRITE (cm_outport1_w) /* output port */ AM_RANGE(0x13, 0x13) AM_WRITE(cm_background_col_w) - AM_RANGE(0x20, 0x20) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( amcoe2_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) - AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ AM_RANGE(0x11, 0x11) AM_WRITENOP AM_RANGE(0x12, 0x12) AM_WRITE (cm_outport1_w) /* output port */ @@ -346,13 +346,13 @@ static ADDRESS_MAP_START( lucky8_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(&goldstar_reel2_scroll) AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(&goldstar_reel3_scroll) - AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xb820, 0xb823) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ - AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xb840, 0xb840) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) /* no sound... only use both ports for DSWs */ + AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xb820, 0xb823) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ + AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("ay", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -369,13 +369,13 @@ static ADDRESS_MAP_START( kkojnoli_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(&goldstar_reel2_scroll) AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(&goldstar_reel3_scroll) - AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xb820, 0xb823) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* Input Port */ + AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xb820, 0xb823) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input Port */ AM_RANGE(0xb830, 0xb830) AM_WRITENOP /* no ay8910 */ AM_RANGE(0xb840, 0xb840) AM_WRITENOP /* no ay8910 */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -408,12 +408,12 @@ static ADDRESS_MAP_START( ladylinr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(&goldstar_reel2_scroll) AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(&goldstar_reel3_scroll) - AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* DSW bank */ - AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xb840, 0xb840) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) /* no sound... only use ports */ + AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DSW bank */ + AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("ay", ay8910_address_w) /* no sound... only use ports */ AM_RANGE(0xb850, 0xb850) AM_WRITENOP /* just turn off the lamps, if exist */ - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index bc130e17444..d01c0fc24d0 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -87,7 +87,7 @@ static ADDRESS_MAP_START( good_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM //AM_RANGE(0x270000, 0x270007) AM_RAM // scroll? - AM_RANGE(0x270000, 0x270001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x270000, 0x270001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x280000, 0x280001) AM_READ_PORT("IN0") AM_RANGE(0x280002, 0x280003) AM_READ_PORT("IN1") diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index 6c2c78a89ef..f84aeae4c99 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -120,7 +120,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki", gotcha_oki_bank_w) + AM_RANGE(0x100004, 0x100005) AM_DEVWRITE("oki", gotcha_oki_bank_w) 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(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) @@ -135,15 +135,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xc006, 0xc006) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0xc002, 0xc003) AM_DEVWRITE(SOUND, "oki", okim6295_w) // TWO addresses! + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("oki", okim6295_w) // TWO addresses! AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index af6d5469241..1922223ea42 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -217,7 +217,7 @@ static VIDEO_UPDATE( gpworld ) static MACHINE_START( gpworld ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index 9df2797ae08..57819fc9f37 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -205,10 +205,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gradius3_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE(SOUND, "konami", sound_bank_w) /* 007232 bankswitch */ + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", sound_bank_w) /* 007232 bankswitch */ AM_RANGE(0xf010, 0xf010) AM_READ(soundlatch_r) - AM_RANGE(0xf020, 0xf02d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xf030, 0xf031) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xf020, 0xf02d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xf030, 0xf031) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index ffb37a7ee94..f26a0bbe376 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -244,7 +244,7 @@ static WRITE8_HANDLER( led_board_w ) static WRITE8_HANDLER( cpu1_outputs_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); grchamp_state *state = space->machine->driver_data; UINT8 diff = data ^ state->cpu1_out[offset]; state->cpu1_out[offset] = data; @@ -456,8 +456,8 @@ static const ay8910_interface ay8910_interface_1 = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "discrete", grchamp_portA_0_w), - DEVCB_DEVICE_HANDLER(SOUND, "discrete", grchamp_portB_0_w) + DEVCB_DEVICE_HANDLER("discrete", grchamp_portA_0_w), + DEVCB_DEVICE_HANDLER("discrete", grchamp_portB_0_w) }; static const ay8910_interface ay8910_interface_3 = @@ -566,12 +566,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x4800, 0x4801) AM_MIRROR(0x07f8) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x4801, 0x4801) AM_MIRROR(0x07f8) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x4802, 0x4803) AM_MIRROR(0x07f8) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x4803, 0x4803) AM_MIRROR(0x07f8) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x4804, 0x4805) AM_MIRROR(0x07fa) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) - AM_RANGE(0x4805, 0x4805) AM_MIRROR(0x07fa) AM_DEVREAD(SOUND, "ay3", ay8910_r) + AM_RANGE(0x4800, 0x4801) AM_MIRROR(0x07f8) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x4801, 0x4801) AM_MIRROR(0x07f8) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x4802, 0x4803) AM_MIRROR(0x07f8) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x4803, 0x4803) AM_MIRROR(0x07f8) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x4804, 0x4805) AM_MIRROR(0x07fa) AM_DEVWRITE("ay3", ay8910_address_data_w) + AM_RANGE(0x4805, 0x4805) AM_MIRROR(0x07fa) AM_DEVREAD("ay3", ay8910_r) AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 9ea764ba1bf..aec54dc755c 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -258,8 +258,8 @@ static WRITE32_HANDLER( gstream_oki_banking_w ) bank_1 = 3; // end sequence music } - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), bank_0 * 0x40000); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), bank_1 * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), bank_0 * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), bank_1 * 0x40000); } static WRITE32_HANDLER( gstream_oki_4040_w ) @@ -273,8 +273,8 @@ static ADDRESS_MAP_START( gstream_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x4020, 0x4023) AM_READ_PORT("IN2") // extra coin switches etc AM_RANGE(0x4030, 0x4033) AM_WRITE(gstream_oki_banking_w) // oki banking AM_RANGE(0x4040, 0x4043) AM_WRITE(gstream_oki_4040_w) // ?? - AM_RANGE(0x4050, 0x4053) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x000000ff) // music and samples - AM_RANGE(0x4060, 0x4063) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x000000ff) // music and samples + AM_RANGE(0x4050, 0x4053) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x000000ff) // music and samples + AM_RANGE(0x4060, 0x4063) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x000000ff) // music and samples ADDRESS_MAP_END static INPUT_PORTS_START( gstream ) diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 820b591ceaf..70becacb7a8 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -330,7 +330,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0x04, 0x04) AM_WRITE(gs_sh_bankswitch_w) AM_RANGE(0x08, 0x08) AM_WRITE(gs_sh_pending_command_clear_w) AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r) diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 57902c2bfa9..482a3f477f3 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -399,10 +399,10 @@ static ADDRESS_MAP_START( cpu2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x01) AM_WRITE(TAITO8741_2_w) AM_READ(TAITO8741_2_r) AM_RANGE(0x20, 0x21) AM_WRITE(TAITO8741_3_w) AM_READ(TAITO8741_3_r) AM_RANGE(0x40, 0x41) AM_WRITE(TAITO8741_1_w) AM_READ(TAITO8741_1_r) - AM_RANGE(0x60, 0x60) AM_DEVREADWRITE(SOUND, "ay1", gsword_fake_0_r, gsword_AY8910_control_port_0_w) - AM_RANGE(0x61, 0x61) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "ay2", gsword_fake_1_r, gsword_AY8910_control_port_1_w) - AM_RANGE(0x81, 0x81) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x60, 0x60) AM_DEVREADWRITE("ay1", gsword_fake_0_r, gsword_AY8910_control_port_0_w) + AM_RANGE(0x61, 0x61) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("ay2", gsword_fake_1_r, gsword_AY8910_control_port_1_w) + AM_RANGE(0x81, 0x81) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) // AM_RANGE(0xe0, 0xe0) AM_READ(SMH_NOP) /* ?? */ AM_RANGE(0xa0, 0xa0) AM_WRITE(SMH_NOP) /* ?? */ @@ -413,7 +413,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "msm", gsword_adpcm_data_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("msm", gsword_adpcm_data_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -433,10 +433,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( josvolly_cpu2_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ay1", gsword_fake_0_r, gsword_AY8910_control_port_0_w) - AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(SOUND, "ay2", gsword_fake_1_r, gsword_AY8910_control_port_1_w) - AM_RANGE(0x41, 0x41) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ay1", gsword_fake_0_r, gsword_AY8910_control_port_0_w) + AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay2", gsword_fake_1_r, gsword_AY8910_control_port_1_w) + AM_RANGE(0x41, 0x41) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) AM_RANGE(0x81, 0x81) AM_WRITE(josvolly_nmi_enable_w) AM_RANGE(0xC1, 0xC1) AM_NOP // irq clear diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 1af1a05888c..bb4798895a7 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -277,7 +277,7 @@ static VIDEO_UPDATE( hangplt ) if (strcmp(screen->tag, "lscreen") == 0) { - const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo0"); + const device_config *voodoo = devtag_get_device(screen->machine, "voodoo0"); // K001604_draw_back_layer(bitmap, cliprect); @@ -287,7 +287,7 @@ static VIDEO_UPDATE( hangplt ) } else if (strcmp(screen->tag, "rscreen") == 0) { - const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo1"); + const device_config *voodoo = devtag_get_device(screen->machine, "voodoo1"); // K001604_draw_back_layer(bitmap, cliprect); @@ -632,7 +632,7 @@ static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_RANGE(0x300000, 0x30000f) AM_READWRITE(K056800_sound_r, K056800_sound_w) - AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE(SOUND, "rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ + AM_RANGE(0x400000, 0x400fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ AM_RANGE(0x580000, 0x580001) AM_WRITENOP AM_RANGE(0x600000, 0x600001) AM_WRITENOP ADDRESS_MAP_END @@ -673,9 +673,9 @@ static ADDRESS_MAP_START( hangplt_sharc0_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w) AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram0_r, dsp_dataram0_w) AM_RANGE(0x1400000, 0x14fffff) AM_RAM - AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE(VOODOO_GRAPHICS, "voodoo0", nwk_voodoo_0_r, voodoo_w) + AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo0", nwk_voodoo_0_r, voodoo_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w) - AM_RANGE(0x3401000, 0x34fffff) AM_DEVWRITE(VOODOO_GRAPHICS, "voodoo0", nwk_fifo_0_w) + AM_RANGE(0x3401000, 0x34fffff) AM_DEVWRITE("voodoo0", nwk_fifo_0_w) AM_RANGE(0x3500000, 0x3507fff) AM_READWRITE(K033906_0_r, K033906_0_w) AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(5) ADDRESS_MAP_END @@ -684,9 +684,9 @@ static ADDRESS_MAP_START( hangplt_sharc1_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_1_shared_sharc_r, cgboard_1_shared_sharc_w) AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram1_r, dsp_dataram1_w) AM_RANGE(0x1400000, 0x14fffff) AM_RAM - AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE(VOODOO_GRAPHICS, "voodoo1", nwk_voodoo_1_r, voodoo_w) + AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo1", nwk_voodoo_1_r, voodoo_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_1_comm_sharc_r, cgboard_1_comm_sharc_w) - AM_RANGE(0x3401000, 0x34fffff) AM_DEVWRITE(VOODOO_GRAPHICS, "voodoo1", nwk_fifo_1_w) + AM_RANGE(0x3401000, 0x34fffff) AM_DEVWRITE("voodoo1", nwk_fifo_1_w) AM_RANGE(0x3500000, 0x3507fff) AM_READWRITE(K033906_1_r, K033906_1_w) AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(6) ADDRESS_MAP_END diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index 5a873b611ab..bad27ecb4b1 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -622,7 +622,7 @@ static WRITE16_HANDLER( io_w ) } case 0x30: { - sn76496_w(devtag_get_device(space->machine, SOUND, "sn"), 0, data & 0xff); + sn76496_w(devtag_get_device(space->machine, "sn"), 0, data & 0xff); break; } case 0x31: diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c index d2387371e13..469fb4a3ccb 100644 --- a/src/mame/drivers/gumbo.c +++ b/src/mame/drivers/gumbo.c @@ -59,7 +59,7 @@ static ADDRESS_MAP_START( gumbo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1b0000, 0x1b03ff) AM_READ(SMH_RAM) AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("P1_P2") AM_RANGE(0x1c0200, 0x1c0201) AM_READ_PORT("DSW") - AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(SMH_RAM) AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -67,7 +67,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gumbo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) // main ram - AM_RANGE(0x1c0300, 0x1c0301) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x1c0300, 0x1c0301) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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 AM_RANGE(0x1f0000, 0x1f3fff) AM_WRITE(gumbo_fg_videoram_w) AM_BASE(&gumbo_fg_videoram) // fg tilemap @@ -81,7 +81,7 @@ static ADDRESS_MAP_START( mspuzzle_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1a0000, 0x1a03ff) AM_READ(SMH_RAM) AM_RANGE(0x1b0100, 0x1b0101) AM_READ_PORT("P1_P2") AM_RANGE(0x1b0200, 0x1b0201) AM_READ_PORT("DSW") - AM_RANGE(0x1b0300, 0x1b0301) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x1b0300, 0x1b0301) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x190000, 0x197fff) AM_READ(SMH_RAM) AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -89,7 +89,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mspuzzle_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) // main ram - AM_RANGE(0x1b0300, 0x1b0301) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x1b0300, 0x1b0301) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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 AM_RANGE(0x1c0000, 0x1c1fff) AM_WRITE(gumbo_bg_videoram_w) AM_BASE(&gumbo_bg_videoram) // bg tilemap @@ -100,7 +100,7 @@ static ADDRESS_MAP_START( dblpoint_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("P1_P2") AM_RANGE(0x1c0200, 0x1c0201) AM_READ_PORT("DSW") - AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x1e0000, 0x1e3fff) AM_READ(SMH_RAM) AM_RANGE(0x1f0000, 0x1f0fff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -108,7 +108,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dblpoint_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) // main ram - AM_RANGE(0x1c0300, 0x1c0301) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x1c0300, 0x1c0301) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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 AM_RANGE(0x1f0000, 0x1f0fff) AM_WRITE(gumbo_bg_videoram_w) AM_BASE(&gumbo_bg_videoram) // bg tilemap diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index c675e6173a0..e945de056ae 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -176,7 +176,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index a6948ee5cb7..48a3c3729a2 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -134,8 +134,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xe002, 0xe003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index 48ddc9df665..dfab23aef64 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -183,21 +183,21 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_cpu1_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0x05, 0x05) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x08, 0x08) AM_DEVWRITE(SOUND, "ay3", ay8910_address_w) - AM_RANGE(0x09, 0x09) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0x0a, 0x0a) AM_DEVWRITE(SOUND, "ay3", ay8910_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVWRITE(SOUND, "ay4", ay8910_address_w) - AM_RANGE(0x0d, 0x0d) AM_DEVREAD(SOUND, "ay4", ay8910_r) - AM_RANGE(0x0e, 0x0e) AM_DEVWRITE(SOUND, "ay4", ay8910_data_w) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ay5", ay8910_address_w) - AM_RANGE(0x11, 0x11) AM_DEVREAD(SOUND, "ay5", ay8910_r) - AM_RANGE(0x12, 0x12) AM_DEVWRITE(SOUND, "ay5", ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0x05, 0x05) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x08, 0x08) AM_DEVWRITE("ay3", ay8910_address_w) + AM_RANGE(0x09, 0x09) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0x0a, 0x0a) AM_DEVWRITE("ay3", ay8910_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("ay4", ay8910_address_w) + AM_RANGE(0x0d, 0x0d) AM_DEVREAD("ay4", ay8910_r) + AM_RANGE(0x0e, 0x0e) AM_DEVWRITE("ay4", ay8910_data_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay5", ay8910_address_w) + AM_RANGE(0x11, 0x11) AM_DEVREAD("ay5", ay8910_r) + AM_RANGE(0x12, 0x12) AM_DEVWRITE("ay5", ay8910_data_w) AM_RANGE(0x14, 0x14) AM_WRITE(gyruss_i8039_irq_w) AM_RANGE(0x18, 0x18) AM_WRITE(soundlatch2_w) ADDRESS_MAP_END @@ -208,7 +208,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(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "discrete", gyruss_dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("discrete", gyruss_dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(gyruss_irq_clear_w) ADDRESS_MAP_END @@ -366,7 +366,7 @@ static const ay8910_interface ay8910_interface_1 = DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "discrete", gyruss_filter0_w) + DEVCB_DEVICE_HANDLER("discrete", gyruss_filter0_w) }; static const ay8910_interface ay8910_interface_2 = @@ -376,7 +376,7 @@ static const ay8910_interface ay8910_interface_2 = DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "discrete", gyruss_filter1_w) + DEVCB_DEVICE_HANDLER("discrete", gyruss_filter1_w) }; static const ay8910_interface ay8910_interface_3 = diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index b22ba6742b6..76f90d27dde 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1663,9 +1663,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) - AM_RANGE(0x4801, 0x4801) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x4803, 0x4803) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0x4805, 0x4805) AM_DEVREAD(SOUND, "ay4", ay8910_r) + AM_RANGE(0x4801, 0x4801) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x4803, 0x4803) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0x4805, 0x4805) AM_DEVREAD("ay4", ay8910_r) AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) // space for diagnostic ROM ADDRESS_MAP_END @@ -1674,9 +1674,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x4800, 0x4801) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x4802, 0x4803) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) - AM_RANGE(0x4804, 0x4805) AM_DEVWRITE(SOUND, "ay4", ay8910_address_data_w) + AM_RANGE(0x4800, 0x4801) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x4802, 0x4803) AM_DEVWRITE("ay3", ay8910_address_data_w) + AM_RANGE(0x4804, 0x4805) AM_DEVWRITE("ay4", ay8910_address_data_w) 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 eba20720ce1..8cb2fbdabd9 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -99,8 +99,8 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(hanaawas_input_port_0_r, hanaawas_inputs_mux_w) AM_RANGE(0x01, 0x01) AM_READNOP /* it must return 0 */ - AM_RANGE(0x10, 0x10) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x10, 0x11) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x10, 0x10) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END static INPUT_PORTS_START( hanaawas ) diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c index a9229824df4..de7f3f9ddfe 100644 --- a/src/mame/drivers/hanaroku.c +++ b/src/mame/drivers/hanaroku.c @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xd000, 0xd000) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN0") AM_RANGE(0xe001, 0xe001) AM_READ_PORT("IN1") AM_RANGE(0xe002, 0xe002) AM_READ_PORT("IN2") @@ -142,7 +142,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xd001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(hanaroku_out_0_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(hanaroku_out_1_w) AM_RANGE(0xe004, 0xe004) AM_WRITE(hanaroku_out_2_w) diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index 59c36b6f7be..7e021b7cd01 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -551,7 +551,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( driversnd_dsp_io_map, ADDRESS_SPACE_IO, 16 ) - AM_RANGE(0, 0) AM_READ(hdsnddsp_rom_r) AM_DEVWRITE(SOUND, "dac", hdsnddsp_dac_w) + AM_RANGE(0, 0) AM_READ(hdsnddsp_rom_r) AM_DEVWRITE("dac", hdsnddsp_dac_w) AM_RANGE(1, 1) AM_READ(hdsnddsp_comram_r) AM_RANGE(2, 2) AM_READ(hdsnddsp_compare_r) AM_RANGE(1, 2) AM_WRITENOP diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index f297c63ba5a..c9993a05b66 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -96,21 +96,21 @@ static WRITE8_DEVICE_HANDLER( sound_bank_w ) static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym", ym3812_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREAD(SOUND, "konami1", k007232_r) + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym", ym3812_r) + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami1", k007232_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9800, 0x987f) AM_DEVWRITE(SOUND, "konami2", k051649_waveform_w) - AM_RANGE(0x9880, 0x9889) AM_DEVWRITE(SOUND, "konami2", k051649_frequency_w) - AM_RANGE(0x988a, 0x988e) AM_DEVWRITE(SOUND, "konami2", k051649_volume_w) - AM_RANGE(0x988f, 0x988f) AM_DEVWRITE(SOUND, "konami2", k051649_keyonoff_w) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami1", k007232_w) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "konami1", sound_bank_w) /* 7232 bankswitch */ + AM_RANGE(0x9800, 0x987f) AM_DEVWRITE("konami2", k051649_waveform_w) + AM_RANGE(0x9880, 0x9889) AM_DEVWRITE("konami2", k051649_frequency_w) + AM_RANGE(0x988a, 0x988e) AM_DEVWRITE("konami2", k051649_volume_w) + AM_RANGE(0x988f, 0x988f) AM_DEVWRITE("konami2", k051649_keyonoff_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami1", k007232_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("konami1", sound_bank_w) /* 7232 bankswitch */ ADDRESS_MAP_END /*****************************************************************************/ diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c index dd8e54b8bbb..627819e0395 100644 --- a/src/mame/drivers/hexa.c +++ b/src/mame/drivers/hexa.c @@ -63,14 +63,14 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xd001, 0xd001) AM_DEVREAD("ay", ay8910_r) 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(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xd008, 0xd008) AM_WRITE(hexa_d008_w) AM_RANGE(0xd010, 0xd010) AM_WRITE(watchdog_reset_w) /* or IRQ acknowledge, or both */ AM_RANGE(0xe000, 0xe7ff) AM_WRITE(hexa_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index c574d91c2a9..8175347a868 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -132,12 +132,12 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "konami", k051649_waveform_w) - AM_RANGE(0xe880, 0xe889) AM_DEVWRITE(SOUND, "konami", k051649_frequency_w) - AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE(SOUND, "konami", k051649_volume_w) - AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE(SOUND, "konami", k051649_keyonoff_w) + AM_RANGE(0xe800, 0xe87f) AM_DEVWRITE("konami", k051649_waveform_w) + AM_RANGE(0xe880, 0xe889) AM_DEVWRITE("konami", k051649_frequency_w) + AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE("konami", k051649_volume_w) + AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE("konami", k051649_keyonoff_w) AM_RANGE(0xf000, 0xf00f) AM_WRITE(SMH_NOP) /* 053252? f00e = IRQ ack, f00f = NMI ack */ - AM_RANGE(0xf200, 0xf200) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xf200, 0xf200) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0xf480, 0xf480) AM_WRITE(hexion_bankswitch_w) AM_RANGE(0xf4c0, 0xf4c0) AM_WRITE(coincntr_w) AM_RANGE(0xf500, 0xf500) AM_WRITE(hexion_gfxrom_select_w) diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c index fd765090175..c6fd92ff366 100644 --- a/src/mame/drivers/higemaru.c +++ b/src/mame/drivers/higemaru.c @@ -48,8 +48,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc800, 0xc800) AM_WRITE(higemaru_c800_w) - AM_RANGE(0xc801, 0xc802) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xc803, 0xc804) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0xc801, 0xc802) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xc803, 0xc804) AM_DEVWRITE("ay2", ay8910_address_data_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(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index 46fd47734cf..92182d995a6 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -263,12 +263,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tv_vcf_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps - AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( SOUND, "oki", tv_oki6395_w ) + AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( "oki", tv_oki6395_w ) AM_RANGE(0x0008, 0x0009) AM_READ( read1_r ) AM_RANGE(0x000a, 0x000b) AM_READ( read2_r ) AM_RANGE(0x000c, 0x000d) AM_READ( read3_r ) AM_RANGE(0x0010, 0x0015) AM_WRITE( tv_vcf_paletteram_w ) - AM_RANGE(0x0030, 0x0031) AM_WRITE( tv_vcf_bankselect_w ) AM_DEVREAD8( SOUND, "oki", okim6376_r, 0x00ff ) + AM_RANGE(0x0030, 0x0031) AM_WRITE( tv_vcf_bankselect_w ) AM_DEVREAD8( "oki", okim6376_r, 0x00ff ) ADDRESS_MAP_END @@ -302,7 +302,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tv_ncf_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps - AM_RANGE(0x0008, 0x0009) AM_DEVWRITE( SOUND, "oki", tv_ncf_oki6395_w ) + AM_RANGE(0x0008, 0x0009) AM_DEVWRITE( "oki", tv_ncf_oki6395_w ) AM_RANGE(0x000c, 0x000d) AM_READ( read1_r ) AM_RANGE(0x0010, 0x0011) AM_READ( tv_ncf_read2_r ) AM_RANGE(0x0012, 0x0013) AM_READ( read3_r ) @@ -346,7 +346,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tv_tcf_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps - AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( SOUND, "oki", tv_oki6395_w ) + AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( "oki", tv_oki6395_w ) AM_RANGE(0x0008, 0x0009) AM_READ( read1_r ) AM_RANGE(0x000a, 0x000b) AM_READ( read2_r ) AM_RANGE(0x0030, 0x0031) AM_READ( read3_r ) AM_WRITE( tv_tcf_bankselect_w ) @@ -407,7 +407,7 @@ static ADDRESS_MAP_START( newmcard_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps AM_RANGE(0x0002, 0x0003) AM_WRITE( write2_w ) // coin counter & coin lockout AM_RANGE(0x0004, 0x0005) AM_WRITE( newmcard_vblank_w ) - AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( SOUND, "oki", tv_oki6395_w ) + AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( "oki", tv_oki6395_w ) AM_RANGE(0x0008, 0x0009) AM_READ( read1_r ) AM_RANGE(0x000a, 0x000b) AM_READ( read2_r ) AM_RANGE(0x000c, 0x000d) AM_READ( newmcard_vblank_r ) @@ -474,7 +474,7 @@ static ADDRESS_MAP_START( brasil_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0030, 0x0031) AM_WRITE( brasil_status_w ) AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps AM_RANGE(0x0002, 0x0003) AM_WRITE( write2_w ) // coin counter & coin lockout - AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( SOUND, "oki", tv_oki6395_w ) + AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( "oki", tv_oki6395_w ) AM_RANGE(0x0008, 0x0009) AM_READ( read1_r ) AM_RANGE(0x000a, 0x000b) AM_READ( read2_r ) AM_RANGE(0x000e, 0x000f) AM_READ( read3_r ) diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index becf569eb6c..5739f7e18cc 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -146,7 +146,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( himesiki_iom1, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym2203", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index ffb832aab65..73c2d15cb8b 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -230,8 +230,8 @@ static ADDRESS_MAP_START( hitme_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1700, 0x17ff) AM_READ(hitme_port_3_r) AM_RANGE(0x1800, 0x18ff) AM_READ_PORT("IN4") AM_RANGE(0x1900, 0x19ff) AM_READ_PORT("IN5") - AM_RANGE(0x1d00, 0x1dff) AM_DEVWRITE(SOUND, "discrete", output_port_0_w) - AM_RANGE(0x1e00, 0x1fff) AM_DEVWRITE(SOUND, "discrete", output_port_1_w) + AM_RANGE(0x1d00, 0x1dff) AM_DEVWRITE("discrete", output_port_0_w) + AM_RANGE(0x1e00, 0x1fff) AM_DEVWRITE("discrete", output_port_1_w) ADDRESS_MAP_END @@ -242,8 +242,8 @@ static ADDRESS_MAP_START( hitme_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x17, 0x17) AM_READ(hitme_port_3_r) AM_RANGE(0x18, 0x18) AM_READ_PORT("IN4") AM_RANGE(0x19, 0x19) AM_READ_PORT("IN5") - AM_RANGE(0x1d, 0x1d) AM_DEVWRITE(SOUND, "discrete", output_port_0_w) - AM_RANGE(0x1e, 0x1f) AM_DEVWRITE(SOUND, "discrete", output_port_1_w) + AM_RANGE(0x1d, 0x1d) AM_DEVWRITE("discrete", output_port_0_w) + AM_RANGE(0x1e, 0x1f) AM_DEVWRITE("discrete", output_port_1_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 90013433719..d8a0d2da378 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -98,7 +98,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_reset_inv_w ) static MACHINE_RESET( hnayayoi ) { /* start with the MSM5205 reset */ - msm5205_reset_w(devtag_get_device(machine, SOUND, "msm"),1); + msm5205_reset_w(devtag_get_device(machine, "msm"),1); } @@ -117,16 +117,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hnayayoi_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym2203_w) - AM_RANGE(0x02, 0x03) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW3") - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "msm", adpcm_data_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("msm", adpcm_data_w) // 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_DEVWRITE(SOUND, "msm", adpcm_vclk_w) - AM_RANGE(0x24, 0x24) AM_DEVWRITE(SOUND, "msm", adpcm_reset_w) + AM_RANGE(0x23, 0x23) AM_DEVWRITE("msm", adpcm_vclk_w) + AM_RANGE(0x24, 0x24) AM_DEVWRITE("msm", adpcm_reset_w) AM_RANGE(0x40, 0x40) AM_WRITE(keyboard_w) AM_RANGE(0x41, 0x41) AM_READ(keyboard_0_r) AM_RANGE(0x42, 0x42) AM_READ(keyboard_1_r) @@ -139,7 +139,7 @@ static ADDRESS_MAP_START( hnfubuki_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xff03) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xff02, 0xff03) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0xff04, 0xff04) AM_READ_PORT("DSW3") AM_RANGE(0xff41, 0xff41) AM_READ(keyboard_0_r) AM_RANGE(0xff42, 0xff42) AM_READ(keyboard_1_r) @@ -150,14 +150,14 @@ static ADDRESS_MAP_START( hnfubuki_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xff01) AM_DEVWRITE(SOUND, "ym", ym2203_w) - AM_RANGE(0xff06, 0xff06) AM_DEVWRITE(SOUND, "msm", adpcm_data_w) + AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0xff06, 0xff06) AM_DEVWRITE("msm", adpcm_data_w) // 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_DEVWRITE(SOUND, "msm", adpcm_vclk_w) - AM_RANGE(0xff24, 0xff24) AM_DEVWRITE(SOUND, "msm", adpcm_reset_inv_w) + AM_RANGE(0xff23, 0xff23) AM_DEVWRITE("msm", adpcm_vclk_w) + AM_RANGE(0xff24, 0xff24) AM_DEVWRITE("msm", adpcm_reset_inv_w) AM_RANGE(0xff40, 0xff40) AM_WRITE(keyboard_w) AM_RANGE(0xff60, 0xff61) AM_WRITE(hnayayoi_palbank_w) AM_RANGE(0xff62, 0xff67) AM_WRITE(dynax_blitter_rev1_param_w) @@ -177,10 +177,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( untoucha_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ym", ym2203_control_port_w) - AM_RANGE(0x11, 0x11) AM_DEVREAD(SOUND, "ym", ym2203_status_port_r) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ym", ym2203_control_port_w) + AM_RANGE(0x11, 0x11) AM_DEVREAD("ym", ym2203_status_port_r) // AM_RANGE(0x12, 0x12) AM_WRITE(SMH_NOP) // CRT Controller - AM_RANGE(0x13, 0x13) AM_DEVWRITE(SOUND, "msm", adpcm_data_w) + AM_RANGE(0x13, 0x13) AM_DEVWRITE("msm", adpcm_data_w) AM_RANGE(0x14, 0x14) AM_READ_PORT("COIN") AM_RANGE(0x15, 0x15) AM_READ(keyboard_1_r) AM_RANGE(0x16, 0x16) AM_READ(keyboard_0_r) // bit 7 = blitter busy flag @@ -189,10 +189,10 @@ static ADDRESS_MAP_START( untoucha_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x1a, 0x1f) AM_WRITE(dynax_blitter_rev1_param_w) AM_RANGE(0x20, 0x20) AM_WRITE(dynax_blitter_rev1_clear_w) AM_RANGE(0x28, 0x28) AM_WRITE(dynax_blitter_rev1_start_w) - AM_RANGE(0x31, 0x31) AM_DEVWRITE(SOUND, "msm", adpcm_vclk_w) - AM_RANGE(0x32, 0x32) AM_DEVWRITE(SOUND, "msm", adpcm_reset_inv_w) - AM_RANGE(0x50, 0x50) AM_DEVWRITE(SOUND, "ym", ym2203_write_port_w) - AM_RANGE(0x51, 0x51) AM_DEVREAD(SOUND, "ym", ym2203_read_port_r) + AM_RANGE(0x31, 0x31) AM_DEVWRITE("msm", adpcm_vclk_w) + AM_RANGE(0x32, 0x32) AM_DEVWRITE("msm", adpcm_reset_inv_w) + AM_RANGE(0x50, 0x50) AM_DEVWRITE("ym", ym2203_write_port_w) + AM_RANGE(0x51, 0x51) AM_DEVREAD("ym", ym2203_read_port_r) // AM_RANGE(0x52, 0x52) AM_WRITE(SMH_NOP) // CRT Controller ADDRESS_MAP_END diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c index d3448a3147c..4d35f31b29d 100644 --- a/src/mame/drivers/holeland.c +++ b/src/mame/drivers/holeland.c @@ -64,10 +64,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x01, 0x01) AM_READ(watchdog_reset_r) /* ? */ - AM_RANGE(0x04, 0x04) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x04, 0x04) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index e075bb9de52..3ee1f97c9d8 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -317,7 +317,7 @@ static WRITE8_HANDLER( mrokumei_sound_io_w ) switch (offset & 0xff) { case 0x40: - dac_signed_data_w(devtag_get_device(space->machine, SOUND, "dac"),data); + dac_signed_data_w(devtag_get_device(space->machine, "dac"),data); break; default: logerror("%04x: I/O write to port %04x\n",cpu_get_pc(space->cpu),offset); @@ -373,13 +373,13 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w ) if (BIT(upd7807_portc,5) && !BIT(data,5)) /* write clock 1->0 */ { - const device_config *device = devtag_get_device(space->machine, SOUND, "ym"); + const device_config *device = devtag_get_device(space->machine, "ym"); ym2203_w(device, BIT(data,3), upd7807_porta); } if (BIT(upd7807_portc,4) && !BIT(data,4)) /* read clock 1->0 */ { - const device_config *device = devtag_get_device(space->machine, SOUND, "ym"); + const device_config *device = devtag_get_device(space->machine, "ym"); upd7807_porta = ym2203_r(device, BIT(data,3)); } @@ -528,7 +528,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w ) coin_counter_w(0,~data & 0x80); if (BIT(upd7807_portc,5) && !BIT(data,5)) /* clock 1->0 */ - sn76496_w(devtag_get_device(space->machine, SOUND, "sn"),0,upd7807_porta); + sn76496_w(devtag_get_device(space->machine, "sn"),0,upd7807_porta); upd7807_portc = data; } @@ -589,7 +589,7 @@ static ADDRESS_MAP_START( mrokumei_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("sn", sn76496_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(SMH_ROM) @@ -651,7 +651,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( reikaids_upd7807_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_READWRITE(reikaids_upd7807_porta_r, reikaids_upd7807_porta_w) - AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_WRITE(reikaids_upd7807_portc_w) AM_RANGE(UPD7807_PORTT, UPD7807_PORTT) AM_READ(reikaids_snd_command_r) ADDRESS_MAP_END @@ -699,7 +699,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_READWRITE(pteacher_upd7807_porta_r, pteacher_upd7807_porta_w) - AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_READ_PORT("COIN") AM_WRITE(pteacher_upd7807_portc_w) AM_RANGE(UPD7807_PORTT, UPD7807_PORTT) AM_READ(pteacher_keyboard_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index fdf00ede0a8..f40a8d54632 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -99,11 +99,11 @@ static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x20, 0x20) AM_WRITE(SMH_NOP) /* ?? */ - AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x40, 0x40) AM_READ_PORT("IN0") AM_RANGE(0x50, 0x50) AM_READ_PORT("IN2") AM_RANGE(0x60, 0x60) AM_READ_PORT("IN1") - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END static const ym2203_interface ym2203_config = diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 93672f13d8d..7252cbee213 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -590,7 +590,7 @@ static VIDEO_START( hornet_2board ) static VIDEO_UPDATE( hornet ) { - const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo0"); + const device_config *voodoo = devtag_get_device(screen->machine, "voodoo0"); voodoo_update(voodoo, bitmap, cliprect); @@ -605,7 +605,7 @@ static VIDEO_UPDATE( hornet_2board ) { if (strcmp(screen->tag, "lscreen") == 0) { - const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo0"); + const device_config *voodoo = devtag_get_device(screen->machine, "voodoo0"); voodoo_update(voodoo, bitmap, cliprect); /* TODO: tilemaps per screen */ @@ -613,7 +613,7 @@ static VIDEO_UPDATE( hornet_2board ) } else if (strcmp(screen->tag, "rscreen") == 0) { - const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo1"); + const device_config *voodoo = devtag_get_device(screen->machine, "voodoo1"); voodoo_update(voodoo, bitmap, cliprect); /* TODO: tilemaps per screen */ @@ -779,7 +779,7 @@ static ADDRESS_MAP_START( hornet_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x780c0000, 0x780c0003) AM_READWRITE(cgboard_dsp_comm_r_ppc, cgboard_dsp_comm_w_ppc) AM_RANGE(0x7d000000, 0x7d00ffff) AM_READ8(sysreg_r, 0xffffffff) AM_RANGE(0x7d010000, 0x7d01ffff) AM_WRITE8(sysreg_w, 0xffffffff) - AM_RANGE(0x7d020000, 0x7d021fff) AM_DEVREADWRITE8(M48T58, "m48t58", timekeeper_r, timekeeper_w, 0xffffffff) /* M48T58Y RTC/NVRAM */ + AM_RANGE(0x7d020000, 0x7d021fff) AM_DEVREADWRITE8("m48t58", timekeeper_r, timekeeper_w, 0xffffffff) /* M48T58Y RTC/NVRAM */ AM_RANGE(0x7d030000, 0x7d030007) AM_READWRITE(K056800_host_r, K056800_host_w) AM_RANGE(0x7d042000, 0x7d043fff) AM_RAM /* COMM BOARD 0 */ AM_RANGE(0x7d044000, 0x7d044007) AM_READ(comm0_unk_r) @@ -796,7 +796,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Work RAM */ - AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE(SOUND, "rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ + AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ AM_RANGE(0x300000, 0x30000f) AM_READWRITE(K056800_sound_r, K056800_sound_w) AM_RANGE(0x600000, 0x600001) AM_NOP ADDRESS_MAP_END @@ -827,7 +827,7 @@ static ADDRESS_MAP_START( sharc0_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w) AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram0_r, dsp_dataram0_w) AM_BASE(&sharc_dataram[0]) AM_RANGE(0x1400000, 0x14fffff) AM_RAM - AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE(VOODOO_GRAPHICS, "voodoo0", voodoo_r, voodoo_w) + AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo0", voodoo_r, voodoo_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w) AM_RANGE(0x3500000, 0x35000ff) AM_READWRITE(K033906_0_r, K033906_0_w) AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(5) @@ -837,7 +837,7 @@ static ADDRESS_MAP_START( sharc1_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_1_shared_sharc_r, cgboard_1_shared_sharc_w) AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram1_r, dsp_dataram1_w) AM_BASE(&sharc_dataram[1]) AM_RANGE(0x1400000, 0x14fffff) AM_RAM - AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE(VOODOO_GRAPHICS, "voodoo1", voodoo_r, voodoo_w) + AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo1", voodoo_r, voodoo_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_1_comm_sharc_r, cgboard_1_comm_sharc_w) AM_RANGE(0x3500000, 0x35000ff) AM_READWRITE(K033906_1_r, K033906_1_w) AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(6) diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 6b79bc7b2c0..0025615ffad 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -109,8 +109,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hotblock_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(hotblock_port0_w) AM_RANGE(0x0004, 0x0004) AM_READ(hotblock_port4_r) AM_WRITE(hotblock_port4_w) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x8001, 0x8001) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index ba7d49aec72..aec1221719a 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -424,7 +424,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c index ecc5528780e..275fc7fd494 100644 --- a/src/mame/drivers/hyhoo.c +++ b/src/mame/drivers/hyhoo.c @@ -69,14 +69,14 @@ static ADDRESS_MAP_START( hyhoo_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_RANGE(0x90, 0x97) AM_WRITE(hyhoo_blitter_w) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r, nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r, nb1413m3_sndrombank1_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_RAM) AM_BASE(&hyhoo_clut) - AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE(SOUND, "dac", DAC_WRITE) // unknown read + AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE("dac", DAC_WRITE) // unknown read AM_RANGE(0xe0, 0xe0) AM_WRITE(hyhoo_romsel_w) AM_RANGE(0xe0, 0xe1) AM_READ(nb1413m3_gfxrom_r) AM_RANGE(0xf0, 0xf0) AM_READ(nb1413m3_dipsw1_r) diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index 33c8bd63114..f2f72caf3af 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -124,11 +124,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* speech data */ - AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE(SOUND, "vlm", hyperspt_sound_w) /* speech and output control */ - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("vlm", vlm5030_data_w) /* speech data */ + AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE("vlm", hyperspt_sound_w) /* speech and output control */ + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xe002, 0xe002) AM_DEVWRITE(SOUND, "sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ ADDRESS_MAP_END diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 1dee7b34d93..8024ef86bd6 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -510,8 +510,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyprduel_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x003fff) AM_READ(SMH_RAM ) AM_RANGE(0x004000, 0x007fff) AM_READ(SMH_RAM ) - AM_RANGE(0x400000, 0x400003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff ) - AM_RANGE(0x400004, 0x400005) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) + AM_RANGE(0x400000, 0x400003) AM_DEVREAD8("ym", ym2151_r, 0x00ff ) + AM_RANGE(0x400004, 0x400005) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM ) AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) ADDRESS_MAP_END @@ -519,8 +519,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyprduel_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x400003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff ) - AM_RANGE(0x400004, 0x400005) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x400000, 0x400003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff ) + AM_RANGE(0x400004, 0x400005) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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 ) @@ -577,8 +577,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magerror_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x003fff) AM_READ(SMH_RAM ) AM_RANGE(0x004000, 0x007fff) AM_READ(SMH_RAM ) -// AM_RANGE(0x400000, 0x400003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff ) - AM_RANGE(0x400004, 0x400005) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) +// AM_RANGE(0x400000, 0x400003) AM_DEVREAD8("ym", ym2151_r, 0x00ff ) + AM_RANGE(0x400004, 0x400005) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM ) AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) ADDRESS_MAP_END @@ -586,8 +586,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magerror_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x400003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x400004, 0x400005) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x400000, 0x400003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x400004, 0x400005) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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 ) diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 055e57f0646..5eb03e82371 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -438,9 +438,9 @@ static ADDRESS_MAP_START( jingbell_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x6492, 0x6492 ) AM_WRITE( jingbell_leds_w ) AM_RANGE( 0x64a0, 0x64a0 ) AM_READ_PORT( "BUTTONS2" ) - AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( "ym", ym2413_w ) - AM_RANGE( 0x64c0, 0x64c0 ) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) + AM_RANGE( 0x64c0, 0x64c0 ) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE( 0x64d0, 0x64d1 ) AM_READWRITE( jingbell_magic_r, jingbell_magic_w ) // DSW1-5 diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index 7d065d04b3d..5948190bb9c 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -630,7 +630,7 @@ static ADDRESS_MAP_START( iqblocka_io, ADDRESS_SPACE_IO, 8 ) // AM_RANGE(0x200a, 0x200a) AM_WRITENOP - AM_RANGE( 0x2010, 0x2013 ) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE( 0x2010, 0x2013 ) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE( 0x2014, 0x2014 ) AM_WRITE( nmi_enable_w ) AM_RANGE( 0x2015, 0x2015 ) AM_WRITE( irq_enable_w ) @@ -641,11 +641,11 @@ static ADDRESS_MAP_START( iqblocka_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x8000, 0x8000 ) AM_WRITE( input_select_w ) AM_RANGE( 0x8001, 0x8001 ) AM_READ ( input_r ) - AM_RANGE( 0x9000, 0x9000 ) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) + AM_RANGE( 0x9000, 0x9000 ) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE( 0xa000, 0xa000 ) AM_READ_PORT( "BUTTONS" ) - AM_RANGE( 0xb000, 0xb001 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE( 0xb000, 0xb001 ) AM_DEVWRITE( "ym", ym2413_w ) ADDRESS_MAP_END @@ -759,7 +759,7 @@ static ADDRESS_MAP_START( mgcs, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0xa02000, 0xa02fff ) AM_READWRITE( spriteram_lsb_r, spriteram_lsb_w ) AM_BASE( (UINT16**)&spriteram ) AM_RANGE( 0xa03000, 0xa037ff ) AM_RAM_WRITE( mgcs_paletteram_xRRRRRGGGGGBBBBB_w ) AM_BASE( &paletteram16 ) - AM_RANGE( 0xa04020, 0xa04027 ) AM_DEVREADWRITE(PPI8255, "ppi8255", mgcs_ppi8255_r, mgcs_ppi8255_w) + AM_RANGE( 0xa04020, 0xa04027 ) AM_DEVREADWRITE("ppi8255", mgcs_ppi8255_r, mgcs_ppi8255_w) AM_RANGE( 0xa04028, 0xa04029 ) AM_WRITE( irq2_enable_w ) AM_RANGE( 0xa0402a, 0xa0402b ) AM_WRITE( irq1_enable_w ) @@ -768,7 +768,7 @@ static ADDRESS_MAP_START( mgcs, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0xa0c000, 0xa0ffff ) AM_READWRITE( bg_lsb_r, bg_lsb_w ) AM_BASE( (UINT16**)&bg_videoram ) // oki banking? - AM_RANGE( 0xa12000, 0xa12001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0xa12000, 0xa12001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) ADDRESS_MAP_END diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 3412ae9ba05..c862cd15640 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -689,7 +689,7 @@ static WRITE16_HANDLER( chmplst2_magic_w ) { chmplst2_pen_hi = data & 0x07; - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (data & 0x08) ? 0x40000 : 0); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (data & 0x08) ? 0x40000 : 0); } if ( chmplst2_pen_hi & ~0xf ) @@ -830,7 +830,7 @@ static WRITE16_HANDLER( grtwall_magic_w ) { coin_counter_w(0,data & 0x01); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (data & 0x10) ? 0x40000 : 0); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (data & 0x10) ? 0x40000 : 0); } if (data & ~0x11) @@ -1084,8 +1084,8 @@ static ADDRESS_MAP_START( chindrag, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs_priority_ram ) AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs_palette_w ) AM_BASE( &paletteram16 ) AM_RANGE( 0x500000, 0x500001 ) AM_READ_PORT( "COIN" ) - AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) - AM_RANGE( 0x700000, 0x700003 ) AM_DEVWRITE8( SOUND, "ym", ym3812_w, 0x00ff ) + AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x700000, 0x700003 ) AM_DEVWRITE8( "ym", ym3812_w, 0x00ff ) AM_RANGE( 0x800000, 0x800003 ) AM_WRITE( chindrag_magic_w ) AM_RANGE( 0x800002, 0x800003 ) AM_READ ( chindrag_magic_r ) AM_RANGE( 0xa20000, 0xa20001 ) AM_WRITE( igs_priority_w ) @@ -1106,8 +1106,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chmplst2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size ) - AM_RANGE( 0x200000, 0x200001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) - AM_RANGE( 0x204000, 0x204003 ) AM_DEVWRITE8( SOUND, "ym", ym2413_w, 0x00ff ) + AM_RANGE( 0x200000, 0x200001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x204000, 0x204003 ) AM_DEVWRITE8( "ym", ym2413_w, 0x00ff ) AM_RANGE( 0x208000, 0x208003 ) AM_WRITE( chmplst2_magic_w ) AM_RANGE( 0x208002, 0x208003 ) AM_READ ( chmplst2_magic_r ) AM_RANGE( 0x20c000, 0x20cfff ) AM_RAM AM_BASE(&igs_priority_ram) @@ -1136,7 +1136,7 @@ static ADDRESS_MAP_START( grtwall, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs_layers_r, igs_layers_w ) AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs_palette_w ) AM_BASE( &paletteram16 ) AM_RANGE( 0x520000, 0x520001 ) AM_READ_PORT( "COIN" ) - AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE( 0x800000, 0x800003 ) AM_WRITE( grtwall_magic_w ) AM_RANGE( 0x800002, 0x800003 ) AM_READ ( grtwall_magic_r ) AM_RANGE( 0xa20000, 0xa20001 ) AM_WRITE( igs_priority_w ) @@ -1162,13 +1162,13 @@ static WRITE16_HANDLER( lhb_irq_enable_w ) } static ADDRESS_MAP_START( lhb, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE( 0x010000, 0x010001 ) AM_DEVWRITE( SOUND, "oki", lhb_okibank_w ) + AM_RANGE( 0x010000, 0x010001 ) AM_DEVWRITE( "oki", lhb_okibank_w ) AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size ) AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs_priority_ram ) AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs_layers_r, igs_layers_w ) AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs_palette_w ) AM_BASE( &paletteram16 ) - AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE( 0x700000, 0x700001 ) AM_READ_PORT( "COIN" ) AM_RANGE( 0x700002, 0x700005 ) AM_READ ( lhb_inputs_r ) AM_RANGE( 0x700002, 0x700003 ) AM_WRITE( lhb_inputs_w ) @@ -1250,7 +1250,7 @@ static ADDRESS_MAP_START( vbowl, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs_layers_r, igs_layers_w ) AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs_palette_w ) AM_BASE( &paletteram16 ) AM_RANGE( 0x520000, 0x520001 ) AM_READ_PORT( "COIN" ) - AM_RANGE( 0x600000, 0x600007 ) AM_DEVREADWRITE( SOUND, "ics", ics2115_word_r, ics2115_word_w ) + AM_RANGE( 0x600000, 0x600007 ) AM_DEVREADWRITE( "ics", ics2115_word_r, ics2115_word_w ) AM_RANGE( 0x700000, 0x700003 ) AM_RAM AM_BASE( &vbowl_trackball ) AM_RANGE( 0x700004, 0x700005 ) AM_WRITE( vbowl_pen_hi_w ) AM_RANGE( 0x800000, 0x800003 ) AM_WRITE( vbowl_magic_w ) @@ -1282,13 +1282,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( xymg, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE( 0x010000, 0x010001 ) AM_DEVWRITE( SOUND, "oki", lhb_okibank_w ) + AM_RANGE( 0x010000, 0x010001 ) AM_DEVWRITE( "oki", lhb_okibank_w ) AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE( &igs_priority_ram ) AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs_layers_r, igs_layers_w ) AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs_palette_w ) AM_BASE( &paletteram16 ) - AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE( 0x700000, 0x700003 ) AM_WRITE( xymg_magic_w ) AM_RANGE( 0x700002, 0x700003 ) AM_READ ( xymg_magic_r ) AM_RANGE( 0x820000, 0x820001 ) AM_WRITE( igs_priority_w ) diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index ac7c189e7f9..2897f6a15e3 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -308,7 +308,7 @@ static ADDRESS_MAP_START( igspoker_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x5090, 0x5090) AM_WRITE(custom_io_w) AM_RANGE(0x5091, 0x5091) AM_READ(custom_io_r) AM_WRITE( igs_lamps_w ) /* Keyboard */ AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("BUTTONS2") /* Not connected */ - AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x50c0, 0x50c0) AM_READ(igs_irqack_r) AM_WRITE(igs_irqack_w) AM_RANGE(0x6800, 0x6fff) AM_RAM_WRITE( bg_tile_w ) AM_BASE( &bg_tile_ram ) AM_RANGE(0x7000, 0x77ff) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram ) @@ -926,7 +926,7 @@ static ADDRESS_MAP_START( number10_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x5091, 0x5091) AM_READ(custom_io_r) AM_WRITE( igs_lamps_w ) /* Keyboard */ AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("BUTTONS2") /* Sound synthesys has been patched out, replaced by ADPCM samples */ - AM_RANGE(0x50b0, 0x50b0) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) + AM_RANGE(0x50b0, 0x50b0) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE(0x50c0, 0x50c0) AM_READ(igs_irqack_r) AM_WRITE(igs_irqack_w) AM_RANGE(0x7000, 0x77ff) AM_RAM_WRITE( fg_tile_w ) AM_BASE( &fg_tile_ram ) AM_RANGE(0x7800, 0x7fff) AM_RAM_WRITE( fg_color_w ) AM_BASE( &fg_color_ram ) diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index 53df9ee29d0..a0695fc6dc6 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -62,8 +62,8 @@ static ADDRESS_MAP_START( ikki_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE(1) - AM_RANGE(0xd801, 0xd801) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xd802, 0xd802) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index 24e4db58a19..fe4767f05e7 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -327,10 +327,10 @@ static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x37f0, 0x37f0) AM_DEVWRITE("ay", ay8910_address_w) /* AM_RANGE(0x37f7, 0x37f7) ? */ AM_RANGE(0x3800, 0x3800) AM_WRITE(vreg_data_w) - AM_RANGE(0x3810, 0x3810) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x3810, 0x3810) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSWA") /* DSWA */ AM_RANGE(0x5000, 0x50ff) AM_WRITE(imola_ledram_w) AM_RANGE(0x47ff, 0x4800) AM_WRITE(transmit_data_w) diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index baa2107a2be..a614b446474 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -232,7 +232,7 @@ static ADDRESS_MAP_START( inufuku_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(inufuku_soundrombank_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) ADDRESS_MAP_END /****************************************************************************** diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index 44569594e36..a3d76a55aa0 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -130,11 +130,11 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x6000, 0x603f) AM_WRITE(iqblock_fgscroll_w) AM_RANGE(0x6800, 0x69ff) AM_WRITE(iqblock_fgvideoram_w) /* initialized up to 6fff... bug or larger tilemap? */ AM_RANGE(0x7000, 0x7fff) AM_WRITE(iqblock_bgvideoram_w) - AM_RANGE(0x5080, 0x5083) AM_DEVWRITE(PPI8255, "ppi8255", ppi8255_w) - AM_RANGE(0x5080, 0x5083) AM_DEVREAD(PPI8255, "ppi8255", ppi8255_r) + AM_RANGE(0x5080, 0x5083) AM_DEVWRITE("ppi8255", ppi8255_w) + AM_RANGE(0x5080, 0x5083) AM_DEVREAD("ppi8255", ppi8255_r) AM_RANGE(0x5090, 0x5090) AM_READ_PORT("SW0") AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("SW1") - AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE(SOUND, "ym", ym2413_w) // UM3567_data_port_0_w + AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ym", ym2413_w) // UM3567_data_port_0_w AM_RANGE(0x50c0, 0x50c0) AM_WRITE(iqblock_irqack_w) AM_RANGE(0x7000, 0x7fff) AM_READ(iqblock_bgvideoram_r) AM_RANGE(0x8000, 0xffff) AM_READ(extrarom_r) diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index 513e094d861..60f2879e34c 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -91,7 +91,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym2203", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( farwest_master_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -131,7 +131,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( farwest_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym2203", ym2203_r, ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w) ADDRESS_MAP_END @@ -374,7 +374,7 @@ static const ym2203_interface ym2203_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "disc_ih", ironhors_filter_w), + DEVCB_DEVICE_HANDLER("disc_ih", ironhors_filter_w), DEVCB_NULL }, NULL @@ -450,7 +450,7 @@ static const ym2203_interface farwest_ym2203_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_HANDLER(farwest_soundlatch_r), - DEVCB_DEVICE_HANDLER(SOUND, "disc_ih", ironhors_filter_w), + DEVCB_DEVICE_HANDLER("disc_ih", ironhors_filter_w), DEVCB_NULL }, NULL diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index a44d5e3fb4f..9ffc4b2de53 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -80,7 +80,7 @@ static VIDEO_UPDATE( istellar ) static MACHINE_START( istellar ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 63266a54a62..edd942c0f90 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -1048,10 +1048,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(sound_return_w) AM_RANGE(0x0400, 0x0400) AM_READ(sound_data_r) - AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_DEVREADWRITE(SOUND, "ensoniq", es5506_r, es5506_w) + AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_DEVREADWRITE("ensoniq", es5506_r, es5506_w) AM_RANGE(0x0c00, 0x0c00) AM_WRITE(sound_bank_w) AM_RANGE(0x1000, 0x1000) AM_WRITENOP /* noisy */ - AM_RANGE(0x1400, 0x140f) AM_DEVREADWRITE(VIA6522, "via6522_0", via_r, via_w) + AM_RANGE(0x1400, 0x140f) AM_DEVREADWRITE("via6522_0", via_r, via_w) AM_RANGE(0x2000, 0x3fff) AM_RAM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -1061,7 +1061,7 @@ ADDRESS_MAP_END /*------ Rev 2 sound board memory layout ------*/ static ADDRESS_MAP_START( sound_020_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x400) AM_READ(sound_data_r) - AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_DEVREADWRITE(SOUND, "ensoniq", es5506_r, es5506_w) + AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_DEVREADWRITE("ensoniq", es5506_r, es5506_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, SMH_NOP) @@ -3950,7 +3950,7 @@ static DRIVER_INIT( wcbowln ) /* PIC 16C54 labeled as ITBWL-3 */ static void install_timekeeper(running_machine *machine) { - const device_config *device = device_list_find_by_tag(machine->config->devicelist, M48T02, "m48t02"); + const device_config *device = devtag_get_device(machine, "m48t02"); memory_install_readwrite32_device_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), device, 0x681000, 0x6817ff, 0, 0, timekeeper_32be_r, timekeeper_32be_w); } diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index c586608c029..a2552a58be9 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -968,9 +968,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound2203_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x3000, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -979,7 +979,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound2608b_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_WRITENOP AM_RANGE(0x2000, 0x2000) AM_READ(sound_data_r) - AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE(SOUND, "ym", ym2608_r, ym2608_w) + AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) AM_RANGE(0x6000, 0x67ff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -989,9 +989,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound3812_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x3000, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x5000, 0x5003) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1001,10 +1001,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound3812_external_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x3000, 0x37ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) - AM_RANGE(0x5000, 0x500f) AM_DEVREADWRITE(VIA6522, "via6522_0", via_r, via_w) + AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) + AM_RANGE(0x5000, 0x500f) AM_DEVREADWRITE("via6522_0", via_r, via_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index ac61ea54fd7..37fcf441706 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -195,8 +195,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END @@ -847,7 +847,7 @@ static const ay8910_interface ay8910_config = AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, DEVCB_MEMORY_HANDLER("audiocpu", PROGRAM, soundlatch_r), - DEVCB_DEVICE_HANDLER(CPU, "audiocpu", timer_r) + DEVCB_DEVICE_HANDLER("audiocpu", timer_r) }; diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index d3bce967b45..3df454037d6 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(SMH_RAM) AM_BASE(&paletteram) // self test only checks 0x4000-0x423f, 007327 should actually go up to 4fff AM_RANGE(0x6000, 0x605f) AM_RAM // SOUND RAM (Self test check 0x6000-605f, 0x7c00-0x7fff) AM_RANGE(0x6060, 0x7fff) AM_RAM AM_SHARE(1) diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index e49eda98f14..197b39fec9c 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -297,7 +297,7 @@ static ADDRESS_MAP_START( jackie_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x5090, 0x5090) AM_READ_PORT("BUTTONS1") AM_RANGE(0x5091, 0x5091) AM_WRITE( jackie_lamps_w ) AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("BUTTONS2") - AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE(SOUND, "ym", ym2413_w) + AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE("ym", ym2413_w) AM_RANGE(0x50c0, 0x50c0) AM_READ(igs_irqack_r) AM_WRITE(igs_irqack_w) AM_RANGE(0x6000, 0x60ff) AM_RAM_WRITE( bg_scroll_w ) AM_BASE( &bg_scroll ) AM_RANGE(0x6800, 0x69ff) AM_RAM_WRITE( jackie_reel1_ram_w ) AM_BASE( &jackie_reel1_ram ) diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index b4d87a9f4fa..1f1cf973615 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -36,8 +36,8 @@ static VIDEO_START(jackpool) static VIDEO_UPDATE(jackpool) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); const gfx_element *gfx = screen->machine->gfx[0]; int count;// = 0x00000/2; @@ -184,7 +184,7 @@ static ADDRESS_MAP_START( jackpool_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x380000, 0x380061) AM_READWRITE(jackpool_io_r,jackpool_io_w) AM_BASE(&jackpool_io)//AM_READ(jackpool_io_r) AM_RANGE(0x800000, 0x80000f) AM_READ(jackpool_ff_r) AM_WRITENOP - AM_RANGE(0xa00000, 0xa00001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xa00000, 0xa00001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) ADDRESS_MAP_END diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 7a90c8c1cb0..4ea3ba858d8 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -100,15 +100,15 @@ static ADDRESS_MAP_START( jailbrek_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2043, 0x2043) AM_WRITENOP /* ??? */ AM_RANGE(0x2044, 0x2044) AM_WRITE(ctrl_w) /* irq, nmi enable, screen flip */ AM_RANGE(0x3000, 0x307f) AM_RAM /* related to sprites? */ - AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE("sn", sn76496_w) AM_RANGE(0x3200, 0x3200) AM_READ_PORT("DSW3") AM_WRITENOP /* mirror of the previous? */ AM_RANGE(0x3300, 0x3300) AM_READ_PORT("SYSTEM") AM_WRITE(watchdog_reset_w) AM_RANGE(0x3301, 0x3301) AM_READ_PORT("P1") AM_RANGE(0x3302, 0x3302) AM_READ_PORT("P2") AM_RANGE(0x3303, 0x3303) AM_READ_PORT("DSW1") - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "vlm", jailbrek_speech_w) /* speech pins */ - AM_RANGE(0x5000, 0x5000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* speech data */ - AM_RANGE(0x6000, 0x6000) AM_DEVREAD(SOUND, "vlm", jailbrek_speech_r) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("vlm", jailbrek_speech_w) /* speech pins */ + AM_RANGE(0x5000, 0x5000) AM_DEVWRITE("vlm", vlm5030_data_w) /* speech data */ + AM_RANGE(0x6000, 0x6000) AM_DEVREAD("vlm", jailbrek_speech_r) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index eab24993945..d65556c673a 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -909,7 +909,7 @@ static ADDRESS_MAP_START( jalmah, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080018, 0x080019) AM_WRITE(jalmah_okibank_w) AM_RANGE(0x08001a, 0x08001b) AM_WRITE(jalmah_okirom_w) /**/AM_RANGE(0x080020, 0x08003f) AM_READ(SMH_RAM) AM_WRITE(jalmah_scroll_w) - AM_RANGE(0x080040, 0x080041) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x080040, 0x080041) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // 0x084000, 0x084001 ? AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) /* Palette RAM */ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(sc0_vram_w) AM_BASE(&sc0_vram) @@ -933,7 +933,7 @@ static ADDRESS_MAP_START( urashima, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080018, 0x080019) AM_WRITE(jalmah_okibank_w) AM_RANGE(0x08001a, 0x08001b) AM_WRITE(jalmah_okirom_w) /**/AM_RANGE(0x08001c, 0x08001d) AM_READ(SMH_RAM) AM_WRITE(urashima_bank_w) - AM_RANGE(0x080040, 0x080041) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x080040, 0x080041) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // 0x084000, 0x084001 ? AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) /* Palette RAM */ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(urashima_sc0_vram_w) AM_BASE(&sc0_vram) diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 2f5e5b06672..2e9a426370e 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -271,7 +271,7 @@ static WRITE8_HANDLER( cvsd_w ) static TIMER_CALLBACK( cvsd_bit_timer_callback ) { /* Data is shifted out at the MSB */ - hc55516_digit_w(devtag_get_device(machine, SOUND, "cvsd"), (cvsd_shiftreg >> 7) & 1); + hc55516_digit_w(devtag_get_device(machine, "cvsd"), (cvsd_shiftreg >> 7) & 1); cvsd_shiftreg <<= 1; /* Trigger an IRQ for every 8 shifted bits */ @@ -344,8 +344,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu0_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02,0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSW") //dsw + blitter busy flag AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x11,0x11) AM_WRITE(mux_w) @@ -415,8 +415,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cntrygrl_cpu0_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02,0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSW") //dsw + blitter busy flag AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x11,0x11) AM_WRITE(mux_w) diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index ade86e5efff..f3e6b7acb17 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -270,9 +270,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jantotsu_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x01, 0x01) AM_READ(jantotsu_dsw2_r) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "adpcm", jan_adpcm_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x01, 0x01) AM_READ(jantotsu_dsw2_r) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("adpcm", jan_adpcm_w) AM_RANGE(0x04, 0x04) AM_READWRITE(jantotsu_mux_r,jantotsu_mux_w) AM_RANGE(0x07, 0x07) AM_WRITE(bankaddr_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index d6b442f969c..4ff25376901 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -538,7 +538,7 @@ static ADDRESS_MAP_START( jchan_sub, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x703fff) AM_RAM AM_BASE(&jchan_spriteram_2) AM_WRITE(jchan_suprnova_sprite32_2_w) AM_RANGE(0x780000, 0x78003f) AM_RAM AM_BASE(&jchan_sprregs_2) AM_WRITE(jchan_suprnova_sprite32regs_2_w) - AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // sound + AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // sound AM_RANGE(0xa00000, 0xa00001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // watchdog ADDRESS_MAP_END diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index a11bb4ddbef..27b78c353ca 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -176,11 +176,11 @@ static ADDRESS_MAP_START( jokrwild_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_WRITE(jokrwild_videoram_w) AM_BASE(&videoram) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_WRITE(jokrwild_colorram_w) AM_BASE(&colorram) // AM_RANGE(0x0010, 0x0010) AM_READ(random_gen_r) -// AM_RANGE(0x4004, 0x4007) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) -// AM_RANGE(0x4008, 0x400b) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) +// AM_RANGE(0x4004, 0x4007) AM_DEVREADWRITE("pia0", pia_r, pia_w) +// AM_RANGE(0x4008, 0x400b) AM_DEVREADWRITE("pia1", pia_r, pia_w) // AM_RANGE(0x4010, 0x4010) AM_READNOP /* R ???? */ - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x6001, 0x6001) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x6001, 0x6001) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) // AM_RANGE(0x6100, 0x6100) AM_READWRITENOP /* R/W ???? */ // AM_RANGE(0x6200, 0x6203) another PIA? // AM_RANGE(0x6300, 0x6300) unknown diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 3591c28623d..686e4af68e5 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -151,8 +151,8 @@ static ADDRESS_MAP_START( jollyjgr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8ff8, 0x8ff8) AM_READ_PORT("DSW1") AM_RANGE(0x8ff9, 0x8ff9) AM_READ_PORT("INPUTS") - AM_RANGE(0x8ff8, 0x8ff8) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x8ffa, 0x8ffa) AM_READ_PORT("SYSTEM") AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x8ff8, 0x8ff8) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x8ffa, 0x8ffa) AM_READ_PORT("SYSTEM") AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x8fff, 0x8fff) AM_READ_PORT("DSW2") AM_RANGE(0x8ffc, 0x8ffc) AM_WRITE(jollyjgr_misc_w) AM_RANGE(0x8ffd, 0x8ffd) AM_WRITE(jollyjgr_coin_lookout_w) diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 632469e4fab..0e18d44fa1d 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -204,8 +204,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jongkyo_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // R 01 keyboard - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("DSW") AM_WRITE(jongkyo_coin_counter_w) AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0") AM_WRITE(mux_w) diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index a1fecd11fbc..5c186449d0b 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -630,9 +630,9 @@ static ADDRESS_MAP_START( m68k_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x004800e0, 0x004800e1) AM_WRITE(unk_w) AM_RANGE(0x004801dc, 0x004801dd) AM_READ(unk_r) AM_RANGE(0x004801de, 0x004801df) AM_READ(unk_r) - AM_RANGE(0x00480080, 0x00480081) AM_DEVWRITE(SOUND, "upd", upd7759_w) - AM_RANGE(0x00480082, 0x00480083) AM_DEVWRITE(SOUND, "upd", volume_w) - AM_RANGE(0x00480084, 0x00480085) AM_DEVREAD(SOUND, "upd", upd7759_r) + AM_RANGE(0x00480080, 0x00480081) AM_DEVWRITE("upd", upd7759_w) + AM_RANGE(0x00480082, 0x00480083) AM_DEVWRITE("upd", volume_w) + AM_RANGE(0x00480084, 0x00480085) AM_DEVREAD("upd", upd7759_r) AM_RANGE(0x004801e0, 0x004801ff) AM_READWRITE(duart_2_r, duart_2_w) AM_RANGE(0x00800000, 0x00800007) AM_READWRITE(m68k_tms_r, m68k_tms_w) AM_RANGE(0x00c00000, 0x00cfffff) AM_ROM diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c index e6aa8f4ab01..5ab93861502 100644 --- a/src/mame/drivers/jpmsys5.c +++ b/src/mame/drivers/jpmsys5.c @@ -284,25 +284,25 @@ static ADDRESS_MAP_START( 68000_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x020000, 0x03ffff) AM_ROMBANK(1) AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x046000, 0x046001) AM_WRITENOP - AM_RANGE(0x046020, 0x046021) AM_DEVREADWRITE8(ACIA6850, "acia6850_0", acia6850_stat_r, acia6850_ctrl_w, 0xff) - AM_RANGE(0x046022, 0x046023) AM_DEVREADWRITE8(ACIA6850, "acia6850_0", acia6850_data_r, acia6850_data_w, 0xff) + AM_RANGE(0x046020, 0x046021) AM_DEVREADWRITE8("acia6850_0", acia6850_stat_r, acia6850_ctrl_w, 0xff) + AM_RANGE(0x046022, 0x046023) AM_DEVREADWRITE8("acia6850_0", acia6850_data_r, acia6850_data_w, 0xff) AM_RANGE(0x046040, 0x04604f) AM_READWRITE(ptm6840_0_lsb_r, ptm6840_0_lsb_w) AM_RANGE(0x046060, 0x046061) AM_READ_PORT("DIRECT") AM_WRITENOP AM_RANGE(0x046062, 0x046063) AM_WRITENOP AM_RANGE(0x046064, 0x046065) AM_WRITENOP AM_RANGE(0x046066, 0x046067) AM_WRITENOP - AM_RANGE(0x046080, 0x046081) AM_DEVREADWRITE8(ACIA6850, "acia6850_1", acia6850_stat_r, acia6850_ctrl_w, 0xff) - AM_RANGE(0x046082, 0x046083) AM_DEVREADWRITE8(ACIA6850, "acia6850_1", acia6850_data_r, acia6850_data_w, 0xff) + AM_RANGE(0x046080, 0x046081) AM_DEVREADWRITE8("acia6850_1", acia6850_stat_r, acia6850_ctrl_w, 0xff) + AM_RANGE(0x046082, 0x046083) AM_DEVREADWRITE8("acia6850_1", acia6850_data_r, acia6850_data_w, 0xff) AM_RANGE(0x046084, 0x046085) AM_READ(unk_r) // PIA? AM_RANGE(0x046088, 0x046089) AM_READ(unk_r) // PIA? - AM_RANGE(0x04608c, 0x04608d) AM_DEVREADWRITE8(ACIA6850, "acia6850_2", acia6850_stat_r, acia6850_ctrl_w, 0xff) - AM_RANGE(0x04608e, 0x04608f) AM_DEVREADWRITE8(ACIA6850, "acia6850_2", acia6850_data_r, acia6850_data_w, 0xff) - AM_RANGE(0x0460a0, 0x0460a3) AM_DEVWRITE8(SOUND, "ym2413", ym2413_w, 0x00ff) + AM_RANGE(0x04608c, 0x04608d) AM_DEVREADWRITE8("acia6850_2", acia6850_stat_r, acia6850_ctrl_w, 0xff) + AM_RANGE(0x04608e, 0x04608f) AM_DEVREADWRITE8("acia6850_2", acia6850_data_r, acia6850_data_w, 0xff) + AM_RANGE(0x0460a0, 0x0460a3) AM_DEVWRITE8("ym2413", ym2413_w, 0x00ff) AM_RANGE(0x0460c0, 0x0460c1) AM_WRITENOP AM_RANGE(0x0460e0, 0x0460e5) AM_WRITE(ramdac_w) AM_RANGE(0x048000, 0x04801f) AM_READWRITE(coins_r, coins_w) AM_RANGE(0x04c000, 0x04c0ff) AM_READ(mux_r) AM_WRITE(mux_w) - AM_RANGE(0x04c100, 0x04c105) AM_DEVREADWRITE(SOUND, "upd7759", jpm_upd7759_r, jpm_upd7759_w) + AM_RANGE(0x04c100, 0x04c105) AM_DEVREADWRITE("upd7759", jpm_upd7759_r, jpm_upd7759_w) AM_RANGE(0x800000, 0xcfffff) AM_READWRITE(sys5_tms34061_r, sys5_tms34061_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 2e77fbafdc6..69356d50bb5 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -125,10 +125,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4ff0, 0x4fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x503f) AM_READ_PORT("P1") AM_RANGE(0x5000, 0x5000) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x5001, 0x5001) AM_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_DEVWRITE("namco", pacman_sound_enable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w) AM_RANGE(0x5040, 0x507f) AM_READ_PORT("P2") - AM_RANGE(0x5040, 0x505f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) AM_RANGE(0x5060, 0x506f) AM_WRITEONLY AM_BASE(&spriteram_2) AM_RANGE(0x5070, 0x5070) AM_WRITE(pengo_palettebank_w) AM_RANGE(0x5071, 0x5071) AM_WRITE(pengo_colortablebank_w) diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index cf11a4e18a7..e0cd0d830f4 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -128,7 +128,7 @@ static WRITE8_DEVICE_HANDLER( junofrst_portB_w ) if (data & 1) C += 47000; /* 47000pF = 0.047uF */ if (data & 2) C += 220000; /* 220000pF = 0.22uF */ data >>= 2; - filter_rc_set_RC(devtag_get_device(device->machine, SOUND, fltname[i]),FLT_RC_LOWPASS,1000,2200,200,CAP_P(C)); + filter_rc_set_RC(devtag_get_device(device->machine, fltname[i]),FLT_RC_LOWPASS,1000,2200,200,CAP_P(C)); } } @@ -203,9 +203,9 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x4001, 0x4001) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x4002, 0x4002) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x4001, 0x4001) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x4002, 0x4002) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(soundlatch2_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(junofrst_i8039_irq_w) ADDRESS_MAP_END @@ -218,7 +218,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_and_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 6d7800493e6..ff2f1dc2477 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -363,10 +363,10 @@ static ADDRESS_MAP_START( berlwall, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x680006, 0x680007) AM_READ_PORT("UNK") AM_RANGE(0x700000, 0x700001) AM_WRITE(kaneko16_coin_lockout_w) // Coin Lockout AM_RANGE(0x780000, 0x780001) AM_READ(watchdog_reset16_r) // Watchdog - AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE(SOUND, "ay1", kaneko16_YM2149_r, kaneko16_YM2149_w) // Sound - AM_RANGE(0x800200, 0x80021f) AM_DEVREADWRITE(SOUND, "ay2", kaneko16_YM2149_r, kaneko16_YM2149_w) + AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE("ay1", kaneko16_YM2149_r, kaneko16_YM2149_w) // Sound + AM_RANGE(0x800200, 0x80021f) AM_DEVREADWRITE("ay2", kaneko16_YM2149_r, kaneko16_YM2149_w) AM_RANGE(0x8003fe, 0x8003ff) AM_NOP // for OKI when accessed as .l - AM_RANGE(0x800400, 0x800401) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x800400, 0x800401) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0xc02000, 0xc02fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // @@ -394,11 +394,11 @@ static WRITE16_DEVICE_HANDLER( bakubrkr_oki_bank_sw ) static ADDRESS_MAP_START( bakubrkr, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM - AM_RANGE(0x400000, 0x40001f) AM_DEVREAD(SOUND, "ay1", kaneko16_YM2149_r) // Sound - AM_RANGE(0x400000, 0x40001d) AM_DEVWRITE(SOUND, "ay1", kaneko16_YM2149_w) - AM_RANGE(0x40001e, 0x40001f) AM_DEVWRITE(SOUND, "oki", bakubrkr_oki_bank_sw) // OKI bank Switch - AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE(SOUND, "ay2", kaneko16_YM2149_r,kaneko16_YM2149_w) // Sound - AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) // + AM_RANGE(0x400000, 0x40001f) AM_DEVREAD("ay1", kaneko16_YM2149_r) // Sound + AM_RANGE(0x400000, 0x40001d) AM_DEVWRITE("ay1", kaneko16_YM2149_w) + AM_RANGE(0x40001e, 0x40001f) AM_DEVWRITE("oki", bakubrkr_oki_bank_sw) // OKI bank Switch + AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE("ay2", kaneko16_YM2149_r,kaneko16_YM2149_w) // Sound + AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // 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) // @@ -503,8 +503,8 @@ static ADDRESS_MAP_START( bloodwar, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs AM_RANGE(0x700000, 0x70001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs - AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x900000, 0x900039) AM_READWRITE(bloodwar_calc_r, bloodwar_calc_w) AM_RANGE(0xa00000, 0xa00001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // Watchdog AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") @@ -514,8 +514,8 @@ static ADDRESS_MAP_START( bloodwar, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb80000, 0xb80001) AM_WRITE(bloodwar_coin_lockout_w) // Coin Lockout AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable) AM_RANGE(0xd00000, 0xd00001) AM_READ(toybox_mcu_status_r) - AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE(SOUND, "oki1", bloodwar_oki_0_bank_w) - AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE(SOUND, "oki2", bloodwar_oki_1_bank_w) + AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE("oki1", bloodwar_oki_0_bank_w) + AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE("oki2", bloodwar_oki_1_bank_w) ADDRESS_MAP_END @@ -563,8 +563,8 @@ static ADDRESS_MAP_START( bonkadv, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs AM_RANGE(0x700000, 0x70001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs - AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x900000, 0x900015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) AM_RANGE(0xa00000, 0xa00001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // Watchdog AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") @@ -574,8 +574,8 @@ static ADDRESS_MAP_START( bonkadv, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb80000, 0xb80001) AM_WRITE(bloodwar_coin_lockout_w) // Coin Lockout AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable) AM_RANGE(0xd00000, 0xd00001) AM_READ(toybox_mcu_status_r) - AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE(SOUND, "oki1", bonkadv_oki_0_bank_w) - AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE(SOUND, "oki2", bonkadv_oki_1_bank_w) + AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE("oki1", bonkadv_oki_0_bank_w) + AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE("oki2", bonkadv_oki_1_bank_w) ADDRESS_MAP_END @@ -629,8 +629,8 @@ static ADDRESS_MAP_START( gtmr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) // Samples - AM_RANGE(0x880000, 0x880001) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) + AM_RANGE(0x800000, 0x800001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) // Samples + AM_RANGE(0x880000, 0x880001) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) AM_RANGE(0x900014, 0x900015) AM_READ(kaneko16_rnd_r ) // Random Number ? AM_RANGE(0xa00000, 0xa00001) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") @@ -662,13 +662,13 @@ static ADDRESS_MAP_START( gtmr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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 - AM_RANGE(0x800000, 0x800001) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) // Samples - AM_RANGE(0x880000, 0x880001) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff ) + AM_RANGE(0x800000, 0x800001) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) // Samples + AM_RANGE(0x880000, 0x880001) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff ) AM_RANGE(0xa00000, 0xa00001) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0xb80000, 0xb80001) AM_WRITE(kaneko16_coin_lockout_w ) // Coin Lockout AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable ) // might do more than that - AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE(SOUND, "oki1", gtmr_oki_0_bank_w ) // Samples Bankswitching - AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE(SOUND, "oki2", gtmr_oki_1_bank_w ) + AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE("oki1", gtmr_oki_0_bank_w ) // Samples Bankswitching + AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE("oki2", gtmr_oki_1_bank_w ) ADDRESS_MAP_END @@ -711,8 +711,8 @@ static ADDRESS_MAP_START( gtmr2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff ) // Samples - AM_RANGE(0x880000, 0x880001) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff ) + AM_RANGE(0x800000, 0x800001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff ) // Samples + AM_RANGE(0x880000, 0x880001) AM_DEVREAD8("oki2", okim6295_r, 0x00ff ) AM_RANGE(0x900014, 0x900015) AM_READ(kaneko16_rnd_r ) // Random Number ? AM_RANGE(0xa00000, 0xa00001) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") @@ -731,9 +731,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mgcrystl, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM - AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE(SOUND, "ay1", kaneko16_YM2149_r, kaneko16_YM2149_w) // Sound - AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE(SOUND, "ay2", kaneko16_YM2149_r, kaneko16_YM2149_w) - AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE("ay1", kaneko16_YM2149_r, kaneko16_YM2149_w) // Sound + AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE("ay2", kaneko16_YM2149_r, kaneko16_YM2149_w) + AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // @@ -765,8 +765,8 @@ static WRITE16_HANDLER( shogwarr_oki_bank_w ) { if (ACCESSING_BITS_0_7) { - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki1"), 0x10000 * ((data >> 0) & 0x3) ); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki2"), 0x10000 * ((data >> 4) & 0x3) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki1"), 0x10000 * ((data >> 0) & 0x3) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki2"), 0x10000 * ((data >> 4) & 0x3) ); } } @@ -779,8 +779,8 @@ static ADDRESS_MAP_START( shogwarr, ADDRESS_SPACE_PROGRAM, 16 ) 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_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette - AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) // Samples - AM_RANGE(0x480000, 0x480001) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) // Samples + AM_RANGE(0x480000, 0x480001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x580000, 0x581fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(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) @@ -818,7 +818,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blazeon_soundport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index ca1ba708355..748f92d1ce6 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -275,8 +275,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END @@ -285,8 +285,8 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 720826d1ed9..148cdcf69cb 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -370,8 +370,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( karnov_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1800, 0x1801) AM_DEVWRITE(SOUND, "ym2", ym3526_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1800, 0x1801) AM_DEVWRITE("ym2", ym3526_w) 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 d7270c07a4f..dfd249a87c4 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -151,11 +151,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w) AM_RANGE(0x01, 0x01) AM_READ(soundlatch_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_data_address_w) AM_RANGE(0x04, 0x04) AM_WRITE(sound_msm_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "msm", sound_control_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("msm", sound_control_w) ADDRESS_MAP_END /******************** @@ -214,9 +214,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kc_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x05, 0x05) AM_WRITE(kc_sound_control_w) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index 13e52ad4359..0629b439197 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -306,7 +306,7 @@ static int m6295_bank; static UINT16 m6295_key_delay; static INTERRUPT_GEN( kickgoal_interrupt ) { - const device_config *adpcm = devtag_get_device(device->machine, SOUND, "oki"); + const device_config *adpcm = devtag_get_device(device->machine, "oki"); if ((okim6295_r(adpcm,0) & 0x08) == 0) { @@ -500,11 +500,11 @@ static WRITE16_HANDLER( kickgoal_eeprom_w ) static ADDRESS_MAP_START( kickgoal_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM -/// AM_RANGE(0x30001e, 0x30001f) AM_DEVWRITE(SOUND, "oki", kickgoal_snd_w) +/// AM_RANGE(0x30001e, 0x30001f) AM_DEVWRITE("oki", kickgoal_snd_w) AM_RANGE(0x800000, 0x800001) AM_READ_PORT("P1_P2") AM_RANGE(0x800002, 0x800003) AM_READ_PORT("SYSTEM") /// AM_RANGE(0x800004, 0x800005) AM_WRITE(soundlatch_word_w) - AM_RANGE(0x800004, 0x800005) AM_DEVWRITE(SOUND, "oki", actionhw_snd_w) + AM_RANGE(0x800004, 0x800005) AM_DEVWRITE("oki", 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_RAM_WRITE(kickgoal_fgram_w) AM_BASE(&kickgoal_fgram) /* FG Layer */ diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 9706915f519..c2ba8fb74e3 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -355,12 +355,12 @@ static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x3000, 0x3fff) AM_ROM //sound rom tested for the post check AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //backup ram - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* I/O Ports */ - AM_RANGE(0x6000, 0x6003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* I/O Ports */ + AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* I/O Ports */ + AM_RANGE(0x6000, 0x6003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* I/O Ports */ AM_RANGE(0x7000, 0x73ff) AM_RAM AM_SHARE(1) AM_RANGE(0x7400, 0x74ff) AM_RAM AM_BASE(&spriteram) - AM_RANGE(0x7600, 0x7600) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x7601, 0x7601) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x7600, 0x7600) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x7601, 0x7601) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x7801, 0x780f) AM_WRITE(led_array_w) AM_RANGE(0x7a00, 0x7a00) AM_RAM //buffer for the key matrix AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("DSW") @@ -378,8 +378,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 0f0a7b48f31..f6d9490380a 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -156,9 +156,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "dac", dac_w) - AM_RANGE(0x08, 0x08) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x0c, 0x0c) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_w) + AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END /* Ring King */ @@ -227,9 +227,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rk_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "dac", dac_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 864de8c6f0b..aa2ae481db7 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -157,7 +157,7 @@ static const UINT8 *control_map; static MACHINE_START( kinst ) { - const device_config *ide = device_list_find_by_tag(machine->config->devicelist, IDE_CONTROLLER, "ide"); + const device_config *ide = devtag_get_device(machine, "ide"); UINT8 *features = ide_get_features(ide); if (strncmp(machine->gamedrv->name, "kinst2", 6) != 0) @@ -403,8 +403,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_BASE(&rambase) AM_RANGE(0x08000000, 0x087fffff) AM_RAM AM_BASE(&rambase2) AM_RANGE(0x10000080, 0x100000ff) AM_READWRITE(kinst_control_r, kinst_control_w) AM_BASE(&kinst_control) - AM_RANGE(0x10000100, 0x1000013f) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", kinst_ide_r, kinst_ide_w) - AM_RANGE(0x10000170, 0x10000173) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", kinst_ide_extra_r, kinst_ide_extra_w) + AM_RANGE(0x10000100, 0x1000013f) AM_DEVREADWRITE("ide", kinst_ide_r, kinst_ide_w) + AM_RANGE(0x10000170, 0x10000173) AM_DEVREADWRITE("ide", kinst_ide_extra_r, kinst_ide_extra_w) AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_ROM AM_REGION("user1", 0) AM_BASE(&rombase) ADDRESS_MAP_END diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index 7fc4b64e5de..79aaf75c830 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0e0000, 0x0e0fff) AM_READ(atarigen_eeprom_r) AM_RANGE(0x260000, 0x260001) AM_READ_PORT("P1") AM_RANGE(0x260002, 0x260003) AM_READ_PORT("P2") - AM_RANGE(0x270000, 0x270001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x270000, 0x270001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x3e0000, 0x3e07ff) AM_READ(SMH_RAM) AM_RANGE(0x3f0000, 0x3f3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -90,7 +90,7 @@ static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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) - AM_RANGE(0x270000, 0x270001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x270000, 0x270001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0x2e0000, 0x2e0001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x360000, 0x360001) AM_WRITE(interrupt_ack_w) AM_RANGE(0x3e0000, 0x3e07ff) AM_WRITE(atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 801f48e5b7a..8e3f3cee4f4 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -64,8 +64,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd804, 0xd804) AM_READ_PORT("DSWB") AM_RANGE(0xd800, 0xd800) AM_WRITE(sound_cmd_w) AM_RANGE(0xd801, 0xd801) AM_WRITE(kncljoe_control_w) - AM_RANGE(0xd802, 0xd802) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xd803, 0xd803) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xd803, 0xd803) AM_DEVWRITE("sn2", sn76496_w) 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) @@ -120,8 +120,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(M6803_PORT1, M6803_PORT1) AM_DEVREADWRITE(SOUND, "ay", m6803_port1_r, m6803_port1_w) - AM_RANGE(M6803_PORT2, M6803_PORT2) AM_DEVREADWRITE(SOUND, "ay", m6803_port2_r, m6803_port2_w) + AM_RANGE(M6803_PORT1, M6803_PORT1) AM_DEVREADWRITE("ay", m6803_port1_r, m6803_port1_w) + AM_RANGE(M6803_PORT2, M6803_PORT2) AM_DEVREADWRITE("ay", m6803_port2_r, m6803_port2_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 2733e472ee3..e1359ffff4c 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -148,7 +148,7 @@ static ADDRESS_MAP_START( koftball_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x2db000, 0x2db001) AM_WRITE(bmc_RAMDAC_offset_w) AM_RANGE(0x2db002, 0x2db003) AM_READWRITE(bmc_RAMDAC_color_r, bmc_RAMDAC_color_w) AM_RANGE(0x2db004, 0x2db005) AM_WRITENOP - AM_RANGE(0x2dc000, 0x2dc001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0x2dc000, 0x2dc001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) AM_RANGE(0x2f0000, 0x2f0003) AM_READ_PORT("INPUTS") AM_RANGE(0x300000, 0x300001) AM_WRITENOP AM_RANGE(0x320000, 0x320001) AM_WRITENOP diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 9920e4103b4..e6253816f0e 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -137,8 +137,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x02) AM_WRITENOP //unknown , many writes - AM_RANGE(0x03, 0x03) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x03, 0x03) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( koikoi ) diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 10134488d1f..a68e5df6d61 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -220,11 +220,11 @@ static READ16_HANDLER( dual539_r ) data = 0; if( ACCESSING_BITS_0_7 ) { - data |= k054539_r( devtag_get_device(space->machine, SOUND, "konami2"), offset ); + data |= k054539_r( devtag_get_device(space->machine, "konami2"), offset ); } if( ACCESSING_BITS_8_15 ) { - data |= k054539_r( devtag_get_device(space->machine, SOUND, "konami1"), offset ) << 8; + data |= k054539_r( devtag_get_device(space->machine, "konami1"), offset ) << 8; } return data; } @@ -233,11 +233,11 @@ static WRITE16_HANDLER( dual539_w ) { if( ACCESSING_BITS_0_7 ) { - k054539_w( devtag_get_device(space->machine, SOUND, "konami2"), offset, data ); + k054539_w( devtag_get_device(space->machine, "konami2"), offset, data ); } if( ACCESSING_BITS_8_15 ) { - k054539_w( devtag_get_device(space->machine, SOUND, "konami1"), offset, data >> 8 ); + k054539_w( devtag_get_device(space->machine, "konami1"), offset, data >> 8 ); } } diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 72561cf62f6..165ca28e1b7 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -185,7 +185,7 @@ static ADDRESS_MAP_START( konamigv_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f801008, 0x1f80100b) AM_RAM /* ?? */ AM_RANGE(0x1f80100c, 0x1f80102f) AM_WRITENOP AM_RANGE(0x1f801010, 0x1f801013) AM_READNOP - AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREAD(SOUND, "spu", psx_spu_delay_r) + AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREAD("spu", psx_spu_delay_r) AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w) AM_RANGE(0x1f801060, 0x1f80106f) AM_WRITENOP AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w) @@ -193,7 +193,7 @@ static ADDRESS_MAP_START( konamigv_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(psx_counter_r, psx_counter_w) AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w) AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w) - AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE(SOUND, "spu", psx_spu_r, psx_spu_w) + AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE("spu", psx_spu_r, psx_spu_w) AM_RANGE(0x1f802020, 0x1f802033) AM_RAM /* ?? */ AM_RANGE(0x1f802040, 0x1f802043) AM_WRITENOP AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_ROM AM_SHARE(2) AM_REGION("user1", 0) /* bios */ @@ -322,7 +322,7 @@ static MACHINE_RESET( konamigv ) psx_machine_init(machine); /* also hook up CDDA audio to the CD-ROM drive */ - cdda_set_cdrom(devtag_get_device(machine, SOUND, "cdda"), am53cf96_get_device(SCSI_ID_4)); + cdda_set_cdrom(devtag_get_device(machine, "cdda"), am53cf96_get_device(SCSI_ID_4)); state_save_register_global_array(machine, sector_buffer); state_save_register_global(machine, flash_address); diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 9ff6b60e5d7..1d180110f9a 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1200,9 +1200,9 @@ static READ16_HANDLER( dual539_r ) UINT16 ret = 0; if (ACCESSING_BITS_0_7) - ret |= k054539_r(devtag_get_device(space->machine, SOUND, "konami2"), offset); + ret |= k054539_r(devtag_get_device(space->machine, "konami2"), offset); if (ACCESSING_BITS_8_15) - ret |= k054539_r(devtag_get_device(space->machine, SOUND, "konami1"), offset)<<8; + ret |= k054539_r(devtag_get_device(space->machine, "konami1"), offset)<<8; return ret; } @@ -1210,9 +1210,9 @@ static READ16_HANDLER( dual539_r ) static WRITE16_HANDLER( dual539_w ) { if (ACCESSING_BITS_0_7) - k054539_w(devtag_get_device(space->machine, SOUND, "konami2"), offset, data); + k054539_w(devtag_get_device(space->machine, "konami2"), offset, data); if (ACCESSING_BITS_8_15) - k054539_w(devtag_get_device(space->machine, SOUND, "konami1"), offset, data>>8); + k054539_w(devtag_get_device(space->machine, "konami1"), offset, data>>8); } static READ16_HANDLER( sndcomm68k_r ) @@ -3312,7 +3312,7 @@ static MACHINE_START( konamigx ) static MACHINE_RESET(konamigx) { - const device_config *k054539_2 = devtag_get_device(machine, SOUND, "konami2"); + const device_config *k054539_2 = devtag_get_device(machine, "konami2"); int i; konamigx_wrport1_0 = konamigx_wrport1_1 = 0; diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 2c906abb9b0..2ed2397ada4 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -126,9 +126,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( soundcpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM - AM_RANGE(0xa001, 0xa001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xa002, 0xa003) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0xa006, 0xa006) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0xa001, 0xa001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0xa006, 0xa006) AM_DEVWRITE("ay2", ay8910_data_address_w) AM_RANGE(0xa008, 0xa008) AM_WRITE(SMH_NOP) AM_RANGE(0xa00c, 0xa00c) AM_WRITE(tomaincpu_w) AM_RANGE(0xa010, 0xa010) AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 19532204304..ae2844d24f6 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -1356,7 +1356,7 @@ static ADDRESS_MAP_START( konami573_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f500000, 0x1f500003) AM_READWRITE( control_r, control_w ) // Konami can't make a game without a "control" register. AM_RANGE(0x1f560000, 0x1f560003) AM_WRITE( atapi_reset_w ) AM_RANGE(0x1f5c0000, 0x1f5c0003) AM_WRITENOP // watchdog? - AM_RANGE(0x1f620000, 0x1f623fff) AM_DEVREADWRITE8(M48T58, "m48t58", timekeeper_r, timekeeper_w, 0x00ff00ff) + AM_RANGE(0x1f620000, 0x1f623fff) AM_DEVREADWRITE8("m48t58", timekeeper_r, timekeeper_w, 0x00ff00ff) AM_RANGE(0x1f680000, 0x1f68001f) AM_READWRITE(mb89371_r, mb89371_w) AM_RANGE(0x1f6a0000, 0x1f6a0003) AM_READWRITE( security_r, security_w ) AM_RANGE(0x1f800000, 0x1f8003ff) AM_RAM /* scratchpad */ @@ -1364,7 +1364,7 @@ static ADDRESS_MAP_START( konami573_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f801008, 0x1f80100b) AM_RAM /* ?? */ AM_RANGE(0x1f80100c, 0x1f80102f) AM_WRITENOP AM_RANGE(0x1f801010, 0x1f801013) AM_READNOP - AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREAD(SOUND, "spu", psx_spu_delay_r) + AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREAD("spu", psx_spu_delay_r) AM_RANGE(0x1f801040, 0x1f80105f) AM_READWRITE(psx_sio_r, psx_sio_w) AM_RANGE(0x1f801060, 0x1f80106f) AM_WRITENOP AM_RANGE(0x1f801070, 0x1f801077) AM_READWRITE(psx_irq_r, psx_irq_w) @@ -1372,7 +1372,7 @@ static ADDRESS_MAP_START( konami573_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(k573_counter_r, k573_counter_w) AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w) AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w) - AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE(SOUND, "spu", psx_spu_r, psx_spu_w) + AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE("spu", psx_spu_r, psx_spu_w) AM_RANGE(0x1f802020, 0x1f802033) AM_RAM /* ?? */ AM_RANGE(0x1f802040, 0x1f802043) AM_WRITENOP AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_ROM AM_SHARE(2) AM_REGION("user1", 0) /* bios */ @@ -1627,7 +1627,7 @@ static void update_mode( running_machine *machine ) if( inserted_cdrom != new_cdrom ) { inserted_cdrom = new_cdrom; - cdda_set_cdrom(devtag_get_device(machine, SOUND, "cdda"), atapi_get_device()); + cdda_set_cdrom(devtag_get_device(machine, "cdda"), atapi_get_device()); } } diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c index a4839961da6..b479ef57547 100644 --- a/src/mame/drivers/kungfur.c +++ b/src/mame/drivers/kungfur.c @@ -160,14 +160,14 @@ static WRITE8_DEVICE_HANDLER( kungfur_adpcm1_w ) { adpcm_pos[0] = 0x40000+(data & 0xff) * 0x100; adpcm_idle[0] = 0; - msm5205_reset_w(devtag_get_device(device->machine, SOUND, "adpcm1"),0); + msm5205_reset_w(devtag_get_device(device->machine, "adpcm1"),0); } static WRITE8_DEVICE_HANDLER( kungfur_adpcm2_w ) { adpcm_pos[1] = (data & 0xff) * 0x400; adpcm_idle[1] = 0; - msm5205_reset_w(devtag_get_device(device->machine, SOUND, "adpcm2"),0); + msm5205_reset_w(devtag_get_device(device->machine, "adpcm2"),0); } /* @@ -182,10 +182,10 @@ static WRITE8_DEVICE_HANDLER( kungfur_adpcm2_w ) */ static ADDRESS_MAP_START( kungfur_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "adpcm1", kungfur_adpcm1_w) - AM_RANGE(0x4004, 0x4004) AM_DEVWRITE(SOUND, "adpcm2", kungfur_adpcm2_w) - AM_RANGE(0x4008, 0x400b) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x400c, 0x400f) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("adpcm1", kungfur_adpcm1_w) + AM_RANGE(0x4004, 0x4004) AM_DEVWRITE("adpcm2", kungfur_adpcm2_w) + AM_RANGE(0x4008, 0x400b) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x400c, 0x400f) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -262,7 +262,7 @@ static void kfr_adpcm1_int(const device_config *device) if (adpcm_pos[0] >= 0x40000 || adpcm_idle[0]) { - msm5205_reset_w(devtag_get_device(device->machine, SOUND, "adpcm1"),1); + msm5205_reset_w(devtag_get_device(device->machine, "adpcm1"),1); trigger = 0; } else @@ -270,7 +270,7 @@ static void kfr_adpcm1_int(const device_config *device) UINT8 *ROM = memory_region(device->machine, "adpcm1"); adpcm_data = ((trigger ? (ROM[adpcm_pos[0]] & 0x0f) : (ROM[adpcm_pos[0]] & 0xf0)>>4) ); - msm5205_data_w(devtag_get_device(device->machine, SOUND, "adpcm1"),adpcm_data & 0xf); + msm5205_data_w(devtag_get_device(device->machine, "adpcm1"),adpcm_data & 0xf); trigger^=1; if(trigger == 0) { @@ -288,7 +288,7 @@ static void kfr_adpcm2_int(const device_config *device) if (adpcm_pos[1] >= 0x10000 || adpcm_idle[1]) { - msm5205_reset_w(devtag_get_device(device->machine, SOUND, "adpcm2"),1); + msm5205_reset_w(devtag_get_device(device->machine, "adpcm2"),1); trigger = 0; } else @@ -296,7 +296,7 @@ static void kfr_adpcm2_int(const device_config *device) UINT8 *ROM = memory_region(device->machine, "adpcm2"); adpcm_data = ((trigger ? (ROM[adpcm_pos[1]] & 0x0f) : (ROM[adpcm_pos[1]] & 0xf0)>>4) ); - msm5205_data_w(devtag_get_device(device->machine, SOUND, "adpcm2"),adpcm_data & 0xf); + msm5205_data_w(devtag_get_device(device->machine, "adpcm2"),adpcm_data & 0xf); trigger^=1; if(trigger == 0) { diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 1addecd5d11..35c9b0f66e2 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -126,9 +126,9 @@ Sub_MemMap( flashgla, 0x7fff, 0xe000, 0xc040, 0xc080, 0xc0c0 ) #define Sub_PortMap( name, ay0_base, ay1_base ) \ static ADDRESS_MAP_START( name##_sub_portmap, ADDRESS_SPACE_IO, 8 ) \ ADDRESS_MAP_GLOBAL_MASK(0xff) \ - AM_RANGE(ay0_base+0, ay0_base+1) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) \ - AM_RANGE(ay0_base+2, ay0_base+2) AM_DEVREAD(SOUND, "ay1", ay8910_r) \ - AM_RANGE(ay1_base+0, ay1_base+1) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) \ + AM_RANGE(ay0_base+0, ay0_base+1) AM_DEVWRITE("ay1", ay8910_address_data_w) \ + AM_RANGE(ay0_base+2, ay0_base+2) AM_DEVREAD("ay1", ay8910_r) \ + AM_RANGE(ay1_base+0, ay1_base+1) AM_DEVWRITE("ay2", ay8910_address_data_w) \ ADDRESS_MAP_END \ Sub_PortMap( gyrodine, 0x00, 0xc0 ) diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index 5afe99a1c7a..8b017b75af3 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -56,10 +56,10 @@ if (data & 0xe0) popmessage("bankswitch %02x",data); static ADDRESS_MAP_START( labyrunr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_WRITE(K007121_ctrl_0_w) AM_RANGE(0x0020, 0x005f) AM_RAM AM_BASE(&labyrunr_scrollram) - AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE(SOUND, "ym1", ym2203_read_port_r, ym2203_write_port_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(SOUND, "ym1", ym2203_status_port_r, ym2203_control_port_w) - AM_RANGE(0x0900, 0x0900) AM_DEVREADWRITE(SOUND, "ym2", ym2203_read_port_r, ym2203_write_port_w) - AM_RANGE(0x0901, 0x0901) AM_DEVREADWRITE(SOUND, "ym2", ym2203_status_port_r, ym2203_control_port_w) + AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("ym1", ym2203_read_port_r, ym2203_write_port_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("ym1", ym2203_status_port_r, ym2203_control_port_w) + AM_RANGE(0x0900, 0x0900) AM_DEVREADWRITE("ym2", ym2203_read_port_r, ym2203_write_port_w) + AM_RANGE(0x0901, 0x0901) AM_DEVREADWRITE("ym2", ym2203_status_port_r, ym2203_control_port_w) AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("P2") AM_RANGE(0x0a01, 0x0a01) AM_READ_PORT("P1") AM_RANGE(0x0b00, 0x0b00) AM_READ_PORT("SYSTEM") diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index 9364aee63ca..46003fb6a20 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -99,8 +99,8 @@ static ADDRESS_MAP_START( ladybug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9002, 0x9002) AM_READ_PORT("DSW0") AM_RANGE(0x9003, 0x9003) AM_READ_PORT("DSW1") AM_RANGE(0xa000, 0xa000) AM_WRITE(ladybug_flipscreen_w) - AM_RANGE(0xb000, 0xbfff) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0xb000, 0xbfff) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(ladybug_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(ladybug_colorram_w) AM_BASE(&colorram) AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN2") @@ -137,11 +137,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sraider_cpu2_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x08, 0x08) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "sn3", sn76496_w) - AM_RANGE(0x18, 0x18) AM_DEVWRITE(SOUND, "sn4", sn76496_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "sn5", sn76496_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x08, 0x08) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("sn3", sn76496_w) + AM_RANGE(0x18, 0x18) AM_DEVWRITE("sn4", sn76496_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("sn5", sn76496_w) AM_RANGE(0x28, 0x3f) AM_WRITE(sraider_misc_w) // lots unknown ADDRESS_MAP_END diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index 596320418ce..b686f4d0121 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -189,8 +189,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xc803) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xc900, 0xc90d) AM_DEVWRITE(SOUND, "msm", msm5232_w) + AM_RANGE(0xc802, 0xc803) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xc900, 0xc90d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xca00, 0xca00) AM_WRITE(SMH_NOP) AM_RANGE(0xcb00, 0xcb00) AM_WRITE(SMH_NOP) AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 94f90d7c396..48c1bcee67f 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -602,7 +602,7 @@ static int active_8910,port0a; static READ8_HANDLER( zaccaria_port0a_r ) { - return ay8910_r(devtag_get_device(space->machine, SOUND, (active_8910 == 0) ? "ay1" : "ay2"), 0); + return ay8910_r(devtag_get_device(space->machine, (active_8910 == 0) ? "ay1" : "ay2"), 0); } static WRITE8_HANDLER( zaccaria_port0a_w ) @@ -619,7 +619,7 @@ static WRITE8_HANDLER( zaccaria_port0b_w ) if ((last & 0x02) == 0x02 && (data & 0x02) == 0x00) { /* bit 0 goes to the 8910 #0 BC1 pin */ - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay1"), last >> 0, port0a); + ay8910_data_address_w(devtag_get_device(space->machine, "ay1"), last >> 0, port0a); } else if ((last & 0x02) == 0x00 && (data & 0x02) == 0x02) { @@ -631,7 +631,7 @@ static WRITE8_HANDLER( zaccaria_port0b_w ) if ((last & 0x08) == 0x08 && (data & 0x08) == 0x00) { /* bit 2 goes to the 8910 #1 BC1 pin */ - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay2"), last >> 2, port0a); + ay8910_data_address_w(devtag_get_device(space->machine, "ay2"), last >> 2, port0a); } else if ((last & 0x08) == 0x00 && (data & 0x08) == 0x08) { diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index 0ce45533952..035de86e505 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -71,10 +71,10 @@ static WRITE8_HANDLER( sound_select_w ) UINT8 to_write = BITSWAP8(*lasso_chip_data, 0, 1, 2, 3, 4, 5, 6, 7); if (~data & 0x01) /* chip #0 */ - sn76496_w(devtag_get_device(space->machine, SOUND, "sn76489.1"), 0, to_write); + sn76496_w(devtag_get_device(space->machine, "sn76489.1"), 0, to_write); if (~data & 0x02) /* chip #1 */ - sn76496_w(devtag_get_device(space->machine, SOUND, "sn76489.2"), 0, to_write); + sn76496_w(devtag_get_device(space->machine, "sn76489.2"), 0, to_write); } @@ -168,7 +168,7 @@ static ADDRESS_MAP_START( wwjgtin_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_MIRROR(0x8000) AM_ROM 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_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0xb003, 0xb003) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xb004, 0xb004) AM_READ(sound_status_r) AM_RANGE(0xb005, 0xb005) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -199,10 +199,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pinbo_audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay2", ay8910_r) 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 0744b39934e..4fc3c08096f 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -109,16 +109,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) - AM_RANGE(0xe800, 0xe801) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xf000, 0xf001) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xe800, 0xe801) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym2", ym2203_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(SMH_ROM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe800, 0xe801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END static WRITE8_HANDLER( mg_bankswitch_w ) @@ -134,17 +134,17 @@ static ADDRESS_MAP_START( mg_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xf002, 0xf003) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xf002, 0xf003) AM_DEVREAD("ym2", ym2203_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(SMH_ROM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xf002, 0xf003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) - AM_RANGE(0xf004, 0xf004) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xf002, 0xf003) AM_DEVWRITE("ym2", ym2203_w) + AM_RANGE(0xf004, 0xf004) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0xf00a, 0xf00a) AM_WRITE(mg_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index 1ac5dc4f1cb..075fc4979cd 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -301,11 +301,11 @@ static WRITE8_HANDLER( lazercmd_hardware_w ) DAC_data=(data&0x80)^((data&0x40)<<1)^((data&0x20)<<2)^((data&0x10)<<3); if (DAC_data) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0xff); + dac_data_w(devtag_get_device(space->machine, "dac"), 0xff); } else { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0); + dac_data_w(devtag_get_device(space->machine, "dac"), 0); } break; case 1: /* marker Y position */ @@ -332,11 +332,11 @@ static WRITE8_HANDLER( medlanes_hardware_w ) DAC_data=((data&0x20)<<2)^((data&0x10)<<3); if (DAC_data) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0xff); + dac_data_w(devtag_get_device(space->machine, "dac"), 0xff); } else { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0); + dac_data_w(devtag_get_device(space->machine, "dac"), 0); } break; case 1: /* marker Y position */ @@ -363,11 +363,11 @@ static WRITE8_HANDLER( bbonk_hardware_w ) DAC_data=((data&0x20)<<2)^((data&0x10)<<3); if (DAC_data) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0xff); + dac_data_w(devtag_get_device(space->machine, "dac"), 0xff); } else { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0); + dac_data_w(devtag_get_device(space->machine, "dac"), 0); } break; case 3: /* D4 clears coin detected and D0 toggles on attract mode */ diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 52a78c0f34f..bb1041eef88 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -209,8 +209,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cupsocbl_sound_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index 9cf07454dc0..78effb4b79d 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -118,16 +118,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x1000, 0x1000) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x0800, 0x0801) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x1000, 0x1000) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) 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(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x1000, 0x1000) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x1000, 0x1000) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(lemmings_sound_ack_w) 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 e562b0fd45d..7d0df4f1cd8 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -503,7 +503,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( le_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xfa2f) AM_DEVREADWRITE(SOUND, "konami", k054539_r, k054539_w) + AM_RANGE(0xf800, 0xfa2f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w) AM_RANGE(0xfc02, 0xfc02) AM_READ(soundlatch_r) AM_RANGE(0xfc03, 0xfc03) AM_READNOP diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c index 6350f2943e3..697fccef243 100644 --- a/src/mame/drivers/lethalj.c +++ b/src/mame/drivers/lethalj.c @@ -217,9 +217,9 @@ static WRITE16_HANDLER( cclownz_control_w ) static ADDRESS_MAP_START( lethalj_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000000, 0x003fffff) AM_RAM - AM_RANGE(0x04000000, 0x0400000f) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x04000010, 0x0400001f) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x04100000, 0x0410000f) AM_DEVREADWRITE8(SOUND, "oki3", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x04000000, 0x0400000f) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x04000010, 0x0400001f) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x04100000, 0x0410000f) AM_DEVREADWRITE8("oki3", okim6295_r, okim6295_w, 0x00ff) // AM_RANGE(0x04100010, 0x0410001f) AM_READNOP /* read but never examined */ AM_RANGE(0x04200000, 0x0420001f) AM_WRITENOP /* clocks bits through here */ AM_RANGE(0x04300000, 0x0430007f) AM_READ(lethalj_gun_r) diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 854bb5240b2..2ac488417cf 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -333,7 +333,7 @@ static INTERRUPT_GEN( vblank_callback_lgp ) static MACHINE_START( lgp ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 9f31061509b..84bbb88d178 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -167,9 +167,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( prosoccr_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay2", ay8910_data_w) AM_RANGE(0x8000, 0x8000) AM_DeVWRITE(SOUND, "ay2", ay8910_address_w) AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -184,10 +184,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_WRITENOP - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x7000, 0x7000) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x7000, 0x7000) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("ay2", ay8910_address_w) 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 8bc3afb6e28..abdd6f840b9 100644 --- a/src/mame/drivers/liberatr.c +++ b/src/mame/drivers/liberatr.c @@ -213,22 +213,22 @@ static ADDRESS_MAP_START( liberatr_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_RAM_WRITE(liberatr_bitmap_w) AM_BASE(&liberatr_bitmapram) /* overlapping for my convenience */ - AM_RANGE(0x4000, 0x403f) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x4000, 0x403f) AM_DEVREAD("earom", atari_vg_earom_r) AM_RANGE(0x5000, 0x5000) AM_READ(liberatr_input_port_0_r) AM_RANGE(0x5001, 0x5001) AM_READ_PORT("IN1") 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_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x6600, 0x6600) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) 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(SMH_RAM) AM_BASE(&liberatr_planet_select) - AM_RANGE(0x6e00, 0x6e3f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x7000, 0x701f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) - AM_RANGE(0x7800, 0x781f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) + AM_RANGE(0x6e00, 0x6e3f) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x7000, 0x701f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) + AM_RANGE(0x7800, 0x781f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) AM_RANGE(0x8000, 0xefff) AM_ROM AM_RANGE(0xfffa, 0xffff) AM_ROM ADDRESS_MAP_END @@ -251,17 +251,17 @@ static ADDRESS_MAP_START( liberat2_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x4800, 0x483f) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) + AM_RANGE(0x4600, 0x4600) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x4800, 0x483f) AM_DEVREAD("earom", atari_vg_earom_r) 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(SMH_RAM) AM_BASE(&liberatr_planet_select) - AM_RANGE(0x4e00, 0x4e3f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x5000, 0x501f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) - AM_RANGE(0x5800, 0x581f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) + AM_RANGE(0x4e00, 0x4e3f) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x5000, 0x501f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) + AM_RANGE(0x5800, 0x581f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) //AM_RANGE(0x6000, 0x601f) AM_WRITE(pokey1_w) /* bug ??? */ AM_RANGE(0x6000, 0xbfff) AM_ROM AM_RANGE(0xfffa, 0xffff) AM_ROM diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 1ef73cbbc28..4d059091853 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -208,11 +208,11 @@ static READ8_HANDLER( spotty_sound_r ) if(spotty_sound_cmd == 0xf7) return soundlatch_r(space,0); else - return okim6295_r(devtag_get_device(space->machine, SOUND, "oki"),0); + return okim6295_r(devtag_get_device(space->machine, "oki"),0); } static ADDRESS_MAP_START( spotty_sound_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ(spotty_sound_r) AM_DEVWRITE(SOUND, "oki", okim6295_w) //? sound latch and ? + AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ(spotty_sound_r) AM_DEVWRITE("oki", okim6295_w) //? sound latch and ? AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_READWRITE(spotty_sound_cmd_r, spotty_sound_cmd_w) //not sure about anything... ADDRESS_MAP_END diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index 27f6109a7c6..914fe9d48cb 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -174,8 +174,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym2", ym2203_r) AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP) /* ??? */ AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* space for diagnostic ROM? */ @@ -184,8 +184,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym2", ym2203_w) 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) diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index 2c06661be6a..639b54712f8 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -207,7 +207,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x02, 0x02) AM_NOP ADDRESS_MAP_END @@ -414,13 +414,13 @@ static WRITE8_HANDLER( sound_vol ) double lgain = gains[data & 0xf]; double rgain = gains[data >> 4]; - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "f2203.1l"), lgain); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "f2203.2l"), lgain); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "f2203.3l"), lgain); + flt_volume_set_volume(devtag_get_device(space->machine, "f2203.1l"), lgain); + flt_volume_set_volume(devtag_get_device(space->machine, "f2203.2l"), lgain); + flt_volume_set_volume(devtag_get_device(space->machine, "f2203.3l"), lgain); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "f2203.1r"), rgain); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "f2203.2r"), rgain); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "f2203.3r"), rgain); + flt_volume_set_volume(devtag_get_device(space->machine, "f2203.1r"), rgain); + flt_volume_set_volume(devtag_get_device(space->machine, "f2203.2r"), rgain); + flt_volume_set_volume(devtag_get_device(space->machine, "f2203.3r"), rgain); } static void ym2203_irq(const device_config *device, int irq) diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 7b834886e22..66340b00a08 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -499,19 +499,19 @@ static ADDRESS_MAP_START( looping_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x37ff) AM_ROM AM_RANGE(0x3800, 0x3bff) AM_RAM - AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_address_w) - AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READNOP AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_DEVREADWRITE("ay", ay8910_r, ay8910_address_w) + AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READNOP AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x3c03, 0x3c03) AM_MIRROR(0x00f6) AM_NOP - AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00f4) AM_DEVREADWRITE(SOUND, "tms", SMH_NOP, tms5220_data_w) - AM_RANGE(0x3e02, 0x3e02) AM_MIRROR(0x00f4) AM_DEVREADWRITE(SOUND, "tms", tms5220_status_r, SMH_NOP) + AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00f4) AM_DEVREADWRITE("tms", SMH_NOP, tms5220_data_w) + AM_RANGE(0x3e02, 0x3e02) AM_MIRROR(0x00f4) AM_DEVREADWRITE("tms", tms5220_status_r, SMH_NOP) AM_RANGE(0x3e03, 0x3e03) AM_MIRROR(0x00f6) AM_NOP ADDRESS_MAP_END static ADDRESS_MAP_START( looping_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x000, 0x000) AM_WRITE(looping_souint_clr) - AM_RANGE(0x001, 0x007) AM_DEVWRITE(SOUND, "dac", looping_sound_sw) - AM_RANGE(0x008, 0x008) AM_DEVWRITE(SOUND, "ay", ay_enable_w) - AM_RANGE(0x009, 0x009) AM_DEVWRITE(SOUND, "tms", speech_enable_w) + AM_RANGE(0x001, 0x007) AM_DEVWRITE("dac", looping_sound_sw) + AM_RANGE(0x008, 0x008) AM_DEVWRITE("ay", ay_enable_w) + AM_RANGE(0x009, 0x009) AM_DEVWRITE("tms", speech_enable_w) AM_RANGE(0x00a, 0x00a) AM_WRITE(ballon_enable_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 128c2c1d0a3..9d57c63abe8 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -191,8 +191,8 @@ static ADDRESS_MAP_START( lordgun_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x503c00, 0x503c01) AM_READ(lordgun_gun_0_y_r) AM_RANGE(0x503e00, 0x503e01) AM_READ(lordgun_gun_1_y_r) AM_RANGE(0x504000, 0x504001) AM_WRITE(lordgun_soundlatch_w) - AM_RANGE(0x506000, 0x506007) AM_DEVREADWRITE(PPI8255, "ppi8255_0", lordgun_ppi8255_r, lordgun_ppi8255_w) - AM_RANGE(0x508000, 0x508007) AM_DEVREADWRITE(PPI8255, "ppi8255_1", lordgun_ppi8255_r, lordgun_ppi8255_w) + AM_RANGE(0x506000, 0x506007) AM_DEVREADWRITE("ppi8255_0", lordgun_ppi8255_r, lordgun_ppi8255_w) + AM_RANGE(0x508000, 0x508007) AM_DEVREADWRITE("ppi8255_1", lordgun_ppi8255_r, lordgun_ppi8255_w) AM_RANGE(0x50a900, 0x50a9ff) AM_RAM // protection ADDRESS_MAP_END @@ -218,8 +218,8 @@ static ADDRESS_MAP_START( hfh_map, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREADWRITE(PPI8255, "ppi8255_0", lordgun_ppi8255_r, lordgun_ppi8255_w) - AM_RANGE(0x508000, 0x508007) AM_DEVREADWRITE(PPI8255, "ppi8255_1", lordgun_ppi8255_r, lordgun_ppi8255_w) + AM_RANGE(0x506000, 0x506007) AM_DEVREADWRITE("ppi8255_0", lordgun_ppi8255_r, lordgun_ppi8255_w) + AM_RANGE(0x508000, 0x508007) AM_DEVREADWRITE("ppi8255_1", lordgun_ppi8255_r, lordgun_ppi8255_w) AM_RANGE(0x50b900, 0x50b9ff) AM_RAM // protection ADDRESS_MAP_END @@ -243,12 +243,12 @@ static WRITE8_DEVICE_HANDLER( lordgun_okibank_w ) } static ADDRESS_MAP_START( lordgun_soundio_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE( SOUND, "ym", ym3812_w ) - AM_RANGE(0x2000, 0x2000) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE( "ym", ym3812_w ) + AM_RANGE(0x2000, 0x2000) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r ) AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r ) AM_RANGE(0x5000, 0x5000) AM_READ( SMH_NOP ) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE( SOUND, "oki", lordgun_okibank_w ) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE( "oki", lordgun_okibank_w ) ADDRESS_MAP_END @@ -256,9 +256,9 @@ 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( SMH_NOP ) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE( SOUND, "ym", ym3812_w ) - AM_RANGE(0x7400, 0x7400) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) - AM_RANGE(0x7800, 0x7800) AM_DEVREADWRITE( SOUND, "oki2", okim6295_r, okim6295_w ) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE( "ym", ym3812_w ) + AM_RANGE(0x7400, 0x7400) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) + AM_RANGE(0x7800, 0x7800) AM_DEVREADWRITE( "oki2", okim6295_r, okim6295_w ) ADDRESS_MAP_END diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index a6a55d0a266..e97a32493e8 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -199,7 +199,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym", ym2203_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(SMH_ROM) /* space for diagnostic ROM? */ @@ -208,8 +208,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym2203_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay", ay8910_address_data_w) 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) @@ -385,8 +385,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_mem_daikaiju, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xd000, 0xd000) AM_READ(daikaiju_sh_sound_command_r) AM_RANGE(0xd400, 0xd400) AM_WRITENOP AM_RANGE(0xd800, 0xd800) AM_READ(daikaiju_sound_status_r) AM_WRITENOP diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 9f3d2b03a40..0115128683d 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -70,7 +70,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xec10, 0xec10) AM_READ_PORT("IN4") AM_RANGE(0xec12, 0xec12) AM_READ_PORT("IN5") - AM_RANGE(0xec20, 0xec20) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xec20, 0xec20) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xec21, 0xec21) AM_READ_PORT("BUTTONS") //ltcasino -> pc: F3F3 (A in service) and F3FD (B in service) AM_RANGE(0xec3e, 0xec3e) AM_READ(SMH_NOP) //not used @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(ltcasino_tile_atr_w) AM_BASE(<casino_tile_atr_ram) AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) - AM_RANGE(0xec20, 0xec21) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0xec20, 0xec21) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0xec30, 0xec3f) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c index 990627a67fc..ada6e1eba67 100644 --- a/src/mame/drivers/lucky74.c +++ b/src/mame/drivers/lucky74.c @@ -825,15 +825,15 @@ static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(fg_colorram_w) AM_BASE(&fg_colorram) /* VRAM1-2 */ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) /* VRAM2-1 */ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(bg_colorram_w) AM_BASE(&bg_colorram) /* VRAM2-2 */ - AM_RANGE(0xf000, 0xf003) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports 0 & 1 */ - AM_RANGE(0xf080, 0xf083) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* DSW 1, 2 & 3 */ - AM_RANGE(0xf0c0, 0xf0c3) AM_DEVREADWRITE(PPI8255, "ppi8255_3", ppi8255_r, ppi8255_w) /* DSW 4 */ - AM_RANGE(0xf100, 0xf100) AM_DEVWRITE(SOUND, "sn1", sn76496_w) /* SN76489 #1 */ - AM_RANGE(0xf200, 0xf203) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports 2 & 4 */ - AM_RANGE(0xf300, 0xf300) AM_DEVWRITE(SOUND, "sn2", sn76496_w) /* SN76489 #2 */ - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) /* YM2149 control */ - AM_RANGE(0xf500, 0xf500) AM_DEVWRITE(SOUND, "sn3", sn76496_w) /* SN76489 #3 */ - AM_RANGE(0xf600, 0xf600) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) /* YM2149 (Input Port 1) */ + AM_RANGE(0xf000, 0xf003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports 0 & 1 */ + AM_RANGE(0xf080, 0xf083) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* DSW 1, 2 & 3 */ + AM_RANGE(0xf0c0, 0xf0c3) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) /* DSW 4 */ + AM_RANGE(0xf100, 0xf100) AM_DEVWRITE("sn1", sn76496_w) /* SN76489 #1 */ + AM_RANGE(0xf200, 0xf203) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports 2 & 4 */ + AM_RANGE(0xf300, 0xf300) AM_DEVWRITE("sn2", sn76496_w) /* SN76489 #2 */ + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("ay", ay8910_address_w) /* YM2149 control */ + AM_RANGE(0xf500, 0xf500) AM_DEVWRITE("sn3", sn76496_w) /* SN76489 #3 */ + AM_RANGE(0xf600, 0xf600) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) /* YM2149 (Input Port 1) */ AM_RANGE(0xf700, 0xf701) AM_READWRITE(usart_8251_r, usart_8251_w) /* USART 8251 port */ AM_RANGE(0xf800, 0xf803) AM_READWRITE(copro_sm7831_r, copro_sm7831_w) /* SM7831 Co-Processor */ ADDRESS_MAP_END diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c index cda72f3eba2..2226246bf48 100644 --- a/src/mame/drivers/lvcards.c +++ b/src/mame/drivers/lvcards.c @@ -177,8 +177,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lvcards_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x00) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( lvpoker_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index 141543dfa76..efba99ae16d 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -354,8 +354,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "2203a", ym2203_w) - AM_RANGE(0xe002, 0xe003) AM_DEVWRITE(SOUND, "2203b", ym2203_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("2203a", ym2203_w) + AM_RANGE(0xe002, 0xe003) AM_DEVWRITE("2203b", ym2203_w) AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_RAM) AM_BASE(&avengers_soundlatch2) ADDRESS_MAP_END @@ -372,13 +372,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( avengers_adpcm_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(avengers_adpcm_r) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "5205", msm5205_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("5205", msm5205_w) ADDRESS_MAP_END static ADDRESS_MAP_START( adpcm_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "5205", msm5205_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("5205", msm5205_w) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index af743e26442..77c6af9fa07 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -139,7 +139,7 @@ static WRITE8_DEVICE_HANDLER(ic8j2_output_changed) /* written from /Q to A with slight delight */ LOG(("ic8j2: %d\n", data)); ttl74123_a_w(device, 0, data); - ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "ic8j1"), 0, data); + ttl74123_a_w(devtag_get_device(device->machine, "ic8j1"), 0, data); } static const ttl74123_config ic8j1_intf = @@ -224,7 +224,7 @@ static MACHINE_RESET( irem ) static WRITE8_HANDLER( m10_ctrl_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); m10_state *state = space->machine->driver_data; #if DEBUG @@ -372,7 +372,7 @@ static WRITE8_HANDLER( m10_a500_w ) static WRITE8_HANDLER( m11_a100_w ) { static int last = 0x00; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int raising_bits = data & ~last; //int falling_bits = ~data & last; @@ -407,7 +407,7 @@ static WRITE8_HANDLER( m11_a100_w ) static WRITE8_HANDLER( m15_a100_w ) { static int last = 0x00; - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); //int raising_bits = data & ~last; int falling_bits = ~data & last; @@ -467,8 +467,8 @@ static READ8_HANDLER( m10_a700_r ) { //LOG(("rd:%d\n",video_screen_get_vpos(space->machine->primary_screen))); LOG(("clear\n")); - ttl74123_clear_w(devtag_get_device(space->machine, TTL74123, "ic8j1"), 0, 0); - ttl74123_clear_w(devtag_get_device(space->machine, TTL74123, "ic8j1"), 0, 1); + ttl74123_clear_w(devtag_get_device(space->machine, "ic8j1"), 0, 0); + ttl74123_clear_w(devtag_get_device(space->machine, "ic8j1"), 0, 1); return 0x00; } @@ -477,8 +477,8 @@ static READ8_HANDLER( m11_a700_r ) //LOG(("rd:%d\n",video_screen_get_vpos(space->machine->primary_screen))); //cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE); LOG(("clear\n")); - ttl74123_clear_w(devtag_get_device(space->machine, TTL74123, "ic8j1"), 0, 0); - ttl74123_clear_w(devtag_get_device(space->machine, TTL74123, "ic8j1"), 0, 1); + ttl74123_clear_w(devtag_get_device(space->machine, "ic8j1"), 0, 0); + ttl74123_clear_w(devtag_get_device(space->machine, "ic8j1"), 0, 1); return 0x00; } diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 1a1a6270292..a444e606bda 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -193,8 +193,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(SMH_NOP) /* Irq controller? */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM - AM_RANGE(0xa8000, 0xa803f) AM_DEVREADWRITE8(SOUND, "irem", irem_ga20_r, irem_ga20_w, 0x00ff) - AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0xa8000, 0xa803f) AM_DEVREADWRITE8("irem", irem_ga20_r, irem_ga20_w, 0x00ff) + AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa8044, 0xa8045) AM_READWRITE(m107_soundlatch_r, m107_sound_irq_ack_w) AM_RANGE(0xa8046, 0xa8047) AM_WRITE(m107_sound_status_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index c02ca4c7af4..21f0bac2935 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -329,8 +329,8 @@ static WRITE8_HANDLER( snd_irq_w ) static WRITE8_HANDLER( snddata_w ) { - const device_config *ay1 = devtag_get_device(space->machine, SOUND, "ay1"); - const device_config *ay2 = devtag_get_device(space->machine, SOUND, "ay2"); + const device_config *ay1 = devtag_get_device(space->machine, "ay1"); + const device_config *ay2 = devtag_get_device(space->machine, "ay2"); if ((p2 & 0xf0) == 0xe0) ay8910_address_w(ay1,0,offset); diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 5d1d2793720..1e8950e568c 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -325,7 +325,7 @@ INLINE DRIVER_INIT( loht_mcu ) const address_space *program = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); const address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO); const address_space *sndio = cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_IO); - const device_config *dac = devtag_get_device(machine, SOUND, "dac"); + const device_config *dac = devtag_get_device(machine, "dac"); protection_ram = auto_malloc(0x10000); memory_install_read16_handler(program, 0xb0000, 0xbffff, 0, 0, SMH_BANK1); @@ -408,7 +408,7 @@ static INTERRUPT_GEN(fake_nmi) const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); int sample = m72_sample_r(space,0); if (sample) - m72_sample_w(devtag_get_device(device->machine, SOUND, "dac"),0,sample); + m72_sample_w(devtag_get_device(device->machine, "dac"),0,sample); } @@ -1033,7 +1033,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rtype_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_irq_ack_w) AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) @@ -1041,19 +1041,19 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r) AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_irq_ack_w) - AM_RANGE(0x82, 0x82) AM_DEVWRITE(SOUND, "dac", m72_sample_w) + AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) ADDRESS_MAP_END static ADDRESS_MAP_START( rtype2_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) AM_RANGE(0x80, 0x81) AM_WRITE(rtype2_sample_addr_w) - AM_RANGE(0x82, 0x82) AM_DEVWRITE(SOUND, "dac", m72_sample_w) + AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w) AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) ADDRESS_MAP_END @@ -1061,7 +1061,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( poundfor_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x10, 0x13) AM_WRITE(poundfor_sample_addr_w) - AM_RANGE(0x40, 0x41) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x42, 0x42) AM_READ(soundlatch_r) AM_RANGE(0x42, 0x42) AM_WRITE(m72_sound_irq_ack_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index 5638db76362..5a4b2b2894a 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -119,10 +119,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(ramtek_videoram_w) AM_BASE(&ramtek_videoram) AM_RANGE(0x6000, 0x63ff) AM_RAM /* ?? */ - AM_RANGE(0x8000, 0x8000) AM_READ_PORT("8000") AM_DEVWRITE(SOUND, "discrete", m79amb_8000_w) + AM_RANGE(0x8000, 0x8000) AM_READ_PORT("8000") AM_DEVWRITE("discrete", m79amb_8000_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(SMH_RAM) AM_BASE(&mask) AM_RANGE(0x8002, 0x8002) AM_READ_PORT("8002") AM_WRITE(m79amb_8002_w) - AM_RANGE(0x8003, 0x8003) AM_DEVWRITE(SOUND, "discrete", m79amb_8003_w) + AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("discrete", m79amb_8003_w) AM_RANGE(0x8004, 0x8004) AM_READ(gray5bit_controller0_r) AM_RANGE(0x8005, 0x8005) AM_READ(gray5bit_controller1_r) AM_RANGE(0xc000, 0xc07f) AM_RAM /* ?? */ diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index 0b041e2d1e2..80c20d8847d 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -154,21 +154,21 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) AM_RANGE(0x80, 0x81) AM_WRITE(rtype2_sample_addr_w) - AM_RANGE(0x82, 0x82) AM_DEVWRITE(SOUND, "dac", m72_sample_w) + AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w) AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) ADDRESS_MAP_END static ADDRESS_MAP_START( bbmanw_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x41) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x42, 0x42) AM_READWRITE(soundlatch_r, m72_sound_irq_ack_w) // AM_RANGE(0x40, 0x41) AM_WRITE(rtype2_sample_addr_w) // AM_RANGE(0x41, 0x41) AM_READ(m72_sample_r) -// AM_RANGE(0x42, 0x42) AM_DEVWRITE(SOUND, "dac", m72_sample_w) +// AM_RANGE(0x42, 0x42) AM_DEVWRITE("dac", m72_sample_w) ADDRESS_MAP_END /*****************************************************************************/ diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index 1cfc38b2138..10420168c3f 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -417,8 +417,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(SMH_NOP) /* Irq controller? */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM - AM_RANGE(0xa8000, 0xa803f) AM_DEVREADWRITE8(SOUND, "irem", irem_ga20_r, irem_ga20_w, 0x00ff) - AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0xa8000, 0xa803f) AM_DEVREADWRITE8("irem", irem_ga20_r, irem_ga20_w, 0x00ff) + AM_RANGE(0xa8040, 0xa8043) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa8044, 0xa8045) AM_READWRITE(m92_soundlatch_r, m92_sound_irq_ack_w) AM_RANGE(0xa8046, 0xa8047) AM_WRITE(m92_sound_status_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index f224e551c63..f7fd9384b50 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -465,7 +465,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x200000, 0x207fff) AM_RAM - AM_RANGE(0x400000, 0x40007f) AM_DEVREADWRITE8(SOUND, "ensoniq", es5506_r, es5506_w, 0x00ff) + AM_RANGE(0x400000, 0x40007f) AM_DEVREADWRITE8("ensoniq", es5506_r, es5506_w, 0x00ff) AM_RANGE(0x600000, 0x600001) AM_READ(macrossp_soundcmd_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 8a04a8ceefd..cdda53bedd1 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( macs_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram ? */ AM_RANGE(0xe800, 0xe87f) AM_RAM AM_BASE(&macs_ram2) - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE(SOUND, "st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xf7ff) AM_RAMBANK(3) /* common /backup ram ?*/ diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index da9ab869145..3829761bb0d 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -87,8 +87,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6400, 0x67ff) AM_RAM AM_RANGE(0x6800, 0x7fff) AM_RAM_WRITE(madalien_charram_w) AM_BASE(&madalien_charram) - 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(0x8000, 0x8000) AM_MIRROR(0x0ff0) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x8001, 0x8001) AM_MIRROR(0x0ff0) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) 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) @@ -112,7 +112,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_RAM /* unknown device in an epoxy block, might be tilt detection */ AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1ffc) AM_READ(madalien_sound_command_r) - AM_RANGE(0x8000, 0x8001) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x8002, 0x8002) AM_MIRROR(0x1ffc) AM_WRITE(soundlatch2_w) AM_RANGE(0xf800, 0xffff) AM_ROM ADDRESS_MAP_END @@ -167,8 +167,8 @@ static const ay8910_interface ay8910_config = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "discrete", madalien_portA_w), - DEVCB_DEVICE_HANDLER(SOUND, "discrete", madalien_portB_w) + DEVCB_DEVICE_HANDLER("discrete", madalien_portA_w), + DEVCB_DEVICE_HANDLER("discrete", madalien_portB_w) }; diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index bf0c078c83c..a1001f0d244 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -88,20 +88,20 @@ ADDRESS_MAP_END /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym2", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x100000, 0x100001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym2", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) 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(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym2", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x100000, 0x100001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym2", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 4c99abb8fbd..4d13e286a36 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -268,7 +268,7 @@ static ADDRESS_MAP_START( magic10_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_READ_PORT("INPUTS") AM_RANGE(0x400002, 0x400003) AM_READ_PORT("DSW") AM_RANGE(0x400008, 0x400009) AM_WRITE(magic10_out_w) - AM_RANGE(0x40000a, 0x40000b) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x40000a, 0x40000b) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x40000e, 0x40000f) AM_WRITENOP AM_RANGE(0x400080, 0x400087) AM_RAM AM_BASE(&magic10_vregs) AM_RANGE(0x600000, 0x603fff) AM_RAM @@ -284,7 +284,7 @@ static ADDRESS_MAP_START( magic10a_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x500001) AM_READ_PORT("INPUTS") AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW") AM_RANGE(0x500008, 0x500009) AM_WRITE(magic10_out_w) - AM_RANGE(0x50000a, 0x50000b) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x50000a, 0x50000b) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x50000e, 0x50000f) AM_WRITENOP AM_RANGE(0x500080, 0x500087) AM_RAM AM_BASE(&magic10_vregs) // video registers? AM_RANGE(0x600000, 0x603fff) AM_RAM @@ -305,7 +305,7 @@ static ADDRESS_MAP_START( magic102_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500002, 0x50001f) AM_READNOP AM_RANGE(0x500002, 0x50001f) AM_WRITENOP AM_RANGE(0x600000, 0x603fff) AM_RAM - AM_RANGE(0x700000, 0x700001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x700000, 0x700001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x700080, 0x700087) AM_RAM AM_BASE(&magic10_vregs) // video registers? ADDRESS_MAP_END @@ -324,7 +324,7 @@ static ADDRESS_MAP_START( hotslot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500018, 0x500019) AM_READ_PORT("DSW1") AM_RANGE(0x50001a, 0x50001d) AM_WRITENOP AM_RANGE(0x600000, 0x603fff) AM_RAM - AM_RANGE(0x70000a, 0x70000b) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x70000a, 0x70000b) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x700080, 0x700087) AM_RAM AM_BASE(&magic10_vregs) ADDRESS_MAP_END @@ -337,7 +337,7 @@ static ADDRESS_MAP_START( sgsafari_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x3001ff) AM_RAM_WRITE(paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW1") AM_RANGE(0x500008, 0x500009) AM_WRITE(magic10_out_w) - AM_RANGE(0x50000a, 0x50000b) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x50000a, 0x50000b) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x50000e, 0x50000f) AM_READ_PORT("IN0") AM_RANGE(0x500080, 0x500087) AM_RAM AM_BASE(&magic10_vregs) // video registers? AM_RANGE(0x600000, 0x603fff) AM_RAM diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index 6008a72094e..5ba5b605116 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -378,7 +378,7 @@ static ADDRESS_MAP_START( magicard_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1ffc40, 0x1ffc41) AM_READ(test_r) AM_RANGE(0x1ffd00, 0x1ffd05) AM_WRITE(paletteram_io_w) //RAMDAC /*not the right sound chip,unknown type,it should be an ADPCM with 8 channels.*/ - AM_RANGE(0x1ffd40, 0x1ffd43) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) + AM_RANGE(0x1ffd40, 0x1ffd43) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) AM_RANGE(0x1ffd80, 0x1ffd81) AM_READ(test_r) AM_RANGE(0x1ffd80, 0x1ffd81) AM_WRITENOP //? AM_RANGE(0x1fff80, 0x1fffbf) AM_RAM //DRAM I/O, not accessed by this game, CD buffer? diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 2ecc1e674ae..ddabdadca74 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -540,7 +540,7 @@ static WRITE8_HANDLER( mux_port_w ) */ input_selector = data & 0x0f; /* Input Selector */ - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), data & 0x80); /* Sound DAC */ + dac_data_w(devtag_get_device(space->machine, "dac"), data & 0x80); /* Sound DAC */ coin_counter_w(0, data & 0x40); /* Coin1 */ coin_counter_w(1, data & 0x10); /* Coin2 */ @@ -554,8 +554,8 @@ static WRITE8_HANDLER( mux_port_w ) static ADDRESS_MAP_START( magicfly_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* MK48Z02B NVRAM */ - AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(magicfly_videoram_w) AM_BASE(&videoram) /* HM6116LP #1 (2K x 8) RAM (only 1st half used) */ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(magicfly_colorram_w) AM_BASE(&colorram) /* HM6116LP #2 (2K x 8) RAM (only 1st half used) */ AM_RANGE(0x2800, 0x2800) AM_READ(mux_port_r) /* multiplexed input port */ diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c index 68f02b60469..297d5757c82 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -116,9 +116,9 @@ static MACHINE_RESET( magmax ) static WRITE8_DEVICE_HANDLER( ay8910_portA_0_w ) { -const device_config *ay1 = devtag_get_device(device->machine, SOUND, "ay1"); -const device_config *ay2 = devtag_get_device(device->machine, SOUND, "ay2"); -const device_config *ay3 = devtag_get_device(device->machine, SOUND, "ay3"); +const device_config *ay1 = devtag_get_device(device->machine, "ay1"); +const device_config *ay2 = devtag_get_device(device->machine, "ay2"); +const device_config *ay3 = devtag_get_device(device->machine, "ay3"); float percent; /*There are three AY8910 chips and four(!) separate amplifiers on the board @@ -246,9 +246,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magmax_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay3", ay8910_address_data_w) AM_RANGE(0x06, 0x06) AM_READ(magmax_sound_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 69dde93db07..de5b4686046 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -101,7 +101,7 @@ static READ8_DEVICE_HANDLER( mainevt_sh_busy_r ) static WRITE8_HANDLER( mainevt_sh_irqcontrol_w ) { - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd"); + const device_config *upd = devtag_get_device(space->machine, "upd"); upd7759_reset_w(upd, data & 2); upd7759_start_w(upd, data & 1); @@ -122,10 +122,10 @@ static WRITE8_HANDLER( mainevt_sh_bankswitch_w ) /* bits 0-3 select the 007232 banks */ bank_A=(data&0x3); bank_B=((data>>2)&0x3); - k007232_set_bank( devtag_get_device(space->machine, SOUND, "konami"), bank_A, bank_B ); + k007232_set_bank( devtag_get_device(space->machine, "konami"), bank_A, bank_B ); /* bits 4-5 select the UPD7759 bank */ - upd7759_set_bank_base(devtag_get_device(space->machine, SOUND, "upd"), ((data >> 4) & 0x03) * 0x20000); + upd7759_set_bank_base(devtag_get_device(space->machine, "upd"), ((data >> 4) & 0x03) * 0x20000); } static WRITE8_DEVICE_HANDLER( dv_sh_bankswitch_w ) @@ -205,15 +205,15 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami", k007232_r) - AM_RANGE(0xd000, 0xd000) AM_DEVREAD(SOUND, "upd", mainevt_sh_busy_r) + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami", k007232_r) + AM_RANGE(0xd000, 0xd000) AM_DEVREAD("upd", mainevt_sh_busy_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami", k007232_w) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "upd", upd7759_port_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami", k007232_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("upd", upd7759_port_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(mainevt_sh_irqcontrol_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(mainevt_sh_bankswitch_w) ADDRESS_MAP_END @@ -222,17 +222,17 @@ static ADDRESS_MAP_START( dv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami", k007232_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami", k007232_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) ADDRESS_MAP_END static ADDRESS_MAP_START( dv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami", k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami", k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(devstor_sh_irqcontrol_w) - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE(SOUND, "konami", dv_sh_bankswitch_w) + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", dv_sh_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index 44de8d96bc4..8c84976f6f8 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -170,9 +170,9 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(sound_command_r) AM_RANGE(0xc000, 0xc000) AM_READ(sound_ack_r) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0xe002, 0xe003) AM_WRITENOP // ? always FFFF, snkwave leftover? - AM_RANGE(0xe008, 0xe009) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0xe008, 0xe009) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index 7f7398b143a..cbc323c00a9 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -718,7 +718,7 @@ static WRITE8_HANDLER( superpac_latch_w ) break; case 0x06: /* SOUND ON */ - mappy_sound_enable(devtag_get_device(space->machine, SOUND, "namco"), bit); + mappy_sound_enable(devtag_get_device(space->machine, "namco"), bit); break; case 0x08: /* 4 RESET */ @@ -763,7 +763,7 @@ static WRITE8_HANDLER( phozon_latch_w ) break; case 0x06: - mappy_sound_enable(devtag_get_device(space->machine, SOUND, "namco"), bit); + mappy_sound_enable(devtag_get_device(space->machine, "namco"), bit); break; case 0x08: @@ -807,7 +807,7 @@ static WRITE8_HANDLER( mappy_latch_w ) break; case 0x06: /* SOUND ON */ - mappy_sound_enable(devtag_get_device(space->machine, SOUND, "namco"), bit); + mappy_sound_enable(devtag_get_device(space->machine, "namco"), bit); break; case 0x08: /* 4 RESET */ @@ -873,7 +873,7 @@ static ADDRESS_MAP_START( superpac_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(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_RAM AM_DEVWRITE(SOUND, "namco", mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ + AM_RANGE(0x4000, 0x43ff) AM_RAM AM_DEVWRITE("namco", 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) @@ -883,7 +883,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( phozon_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(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_RAM AM_DEVWRITE(SOUND, "namco", mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ + AM_RANGE(0x4000, 0x43ff) AM_RAM AM_DEVWRITE("namco", 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 */ @@ -894,7 +894,7 @@ static ADDRESS_MAP_START( mappy_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE(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_RAM AM_DEVWRITE(SOUND, "namco", mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ + AM_RANGE(0x4000, 0x43ff) AM_RAM AM_DEVWRITE("namco", 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 */ @@ -903,18 +903,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( superpac_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_RAM AM_DEVWRITE(SOUND, "namco", 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_RAM AM_DEVWRITE("namco", 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_RAM AM_DEVWRITE(SOUND, "namco", mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ + AM_RANGE(0x0000, 0x03ff) AM_RAM AM_DEVWRITE("namco", 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_RAM AM_DEVWRITE(SOUND, "namco", 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_RAM AM_DEVWRITE("namco", 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 @@ -924,7 +924,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( phozon_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(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_RAM AM_DEVWRITE(SOUND, "namco", mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with CPU #2 */ + AM_RANGE(0x4000, 0x43ff) AM_RAM AM_DEVWRITE("namco", 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 @@ -2132,7 +2132,7 @@ static DRIVER_INIT( grobda ) However, removing the 15XX from the board causes sound to disappear completely, so the DAC might be built-in after all. */ - const device_config *dac = devtag_get_device(machine, SOUND, "dac"); + const device_config *dac = devtag_get_device(machine, "dac"); memory_install_write8_device_handler(cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_PROGRAM), dac, 0x0002, 0x0002, 0, 0, grobda_DAC_w ); DRIVER_INIT_CALL(58_56); diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index 1b303339357..354cac23e0e 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -73,13 +73,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( marineb_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x09) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay1", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( wanted_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index b0abc390aab..234b6ccd1e2 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -149,14 +149,14 @@ static ADDRESS_MAP_START( mario_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_RAM_WRITE(mario_videoram_w) AM_BASE_MEMBER(mario_state, videoram) - AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_DEVWRITE(SOUND, "discrete", mario_sh1_w) /* Mario run sample */ - AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_DEVWRITE(SOUND, "discrete", mario_sh2_w) /* Luigi run sample */ + AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_DEVWRITE("discrete", mario_sh1_w) /* Mario run sample */ + AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_DEVWRITE("discrete", mario_sh2_w) /* Luigi run sample */ AM_RANGE(0x7d00, 0x7d00) AM_WRITE(mario_scroll_w) AM_RANGE(0x7e80, 0x7e80) AM_WRITE(mario_gfxbank_w) AM_RANGE(0x7e82, 0x7e82) AM_WRITE(mario_flip_w) AM_RANGE(0x7e83, 0x7e83) AM_WRITE(mario_palettebank_w) AM_RANGE(0x7e84, 0x7e84) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE(Z80DMA, "z80dma", z80dma_rdy_w) /* ==> DMA Chip */ + AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE("z80dma", z80dma_rdy_w) /* ==> DMA Chip */ AM_RANGE(0x7f00, 0x7f07) AM_WRITE(mario_sh3_w) /* Sound port */ AM_RANGE(0x7f80, 0x7f80) AM_READ_PORT("DSW") /* DSW */ AM_RANGE(0x7e00, 0x7e00) AM_WRITE(mario_sh_tuneselect_w) @@ -176,7 +176,7 @@ static ADDRESS_MAP_START( masao_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7e82, 0x7e82) AM_WRITE(mario_flip_w) AM_RANGE(0x7e83, 0x7e83) AM_WRITE(mario_palettebank_w) AM_RANGE(0x7e84, 0x7e84) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE(Z80DMA, "z80dma", z80dma_rdy_w) /* ==> DMA Chip */ + AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE("z80dma", z80dma_rdy_w) /* ==> DMA Chip */ AM_RANGE(0x7f00, 0x7f00) AM_WRITE(masao_sh_irqtrigger_w) AM_RANGE(0x7f80, 0x7f80) AM_READ_PORT("DSW") /* DSW */ AM_RANGE(0xf000, 0xffff) AM_ROM @@ -184,7 +184,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mario_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(Z80DMA, "z80dma", z80dma_r, z80dma_w) /* dma controller */ + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("z80dma", z80dma_r, z80dma_w) /* dma controller */ ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c index a969686267b..a47b7861b11 100644 --- a/src/mame/drivers/markham.c +++ b/src/mame/drivers/markham.c @@ -73,8 +73,8 @@ static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_SHARE(1) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xc001, 0xc001) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xc001, 0xc001) AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0xc002, 0xc002) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xc003, 0xc003) AM_WRITE(SMH_NOP) /* unknown */ diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index c5366356968..2d7fe17f94d 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -609,7 +609,7 @@ static WRITE8_HANDLER( backupram_enable_w ) static WRITE8_HANDLER( msm5205_mastboy_m5205_sambit0_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, "msm"); + const device_config *adpcm = devtag_get_device(space->machine, "msm"); mastboy_m5205_sambit0 = data & 1; msm5205_playmode_w(adpcm, (1 << 2) | (mastboy_m5205_sambit1 << 1) | (mastboy_m5205_sambit0) ); @@ -619,7 +619,7 @@ static WRITE8_HANDLER( msm5205_mastboy_m5205_sambit0_w ) static WRITE8_HANDLER( msm5205_mastboy_m5205_sambit1_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, "msm"); + const device_config *adpcm = devtag_get_device(space->machine, "msm"); mastboy_m5205_sambit1 = data & 1; @@ -701,13 +701,13 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xff000, 0xff7ff) AM_WRITE(mastboy_backupram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xff820, 0xff827) AM_WRITE(mastboy_bank_w) - AM_RANGE(0xff828, 0xff828) AM_DEVWRITE(SOUND, "saa", saa1099_data_w) - AM_RANGE(0xff829, 0xff829) AM_DEVWRITE(SOUND, "saa", saa1099_control_w) + AM_RANGE(0xff828, 0xff828) AM_DEVWRITE("saa", saa1099_data_w) + AM_RANGE(0xff829, 0xff829) AM_DEVWRITE("saa", saa1099_control_w) AM_RANGE(0xff830, 0xff830) AM_WRITE(mastboy_msm5205_data_w) AM_RANGE(0xff838, 0xff838) AM_WRITE(mastboy_irq0_ack_w) AM_RANGE(0xff839, 0xff839) AM_WRITE(msm5205_mastboy_m5205_sambit0_w) AM_RANGE(0xff83a, 0xff83a) AM_WRITE(msm5205_mastboy_m5205_sambit1_w) - AM_RANGE(0xff83b, 0xff83b) AM_DEVWRITE(SOUND, "msm", mastboy_msm5205_reset_w) + AM_RANGE(0xff83b, 0xff83b) AM_DEVWRITE("msm", mastboy_msm5205_reset_w) AM_RANGE(0xff83c, 0xff83c) AM_WRITE(backupram_enable_w) AM_RANGE(0xffc00, 0xfffff) AM_WRITE(SMH_RAM) // Internal RAM ADDRESS_MAP_END @@ -856,7 +856,7 @@ static MACHINE_RESET( mastboy ) memset( mastboy_vram, 0x00, 0x10000); mastboy_m5205_part = 0; - msm5205_reset_w(devtag_get_device(machine, SOUND, "msm"),1); + msm5205_reset_w(devtag_get_device(machine, "msm"),1); mastboy_irq0_ack = 0; } diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index a938e69715b..04011d19f7a 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -120,9 +120,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x2002, 0x2003) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x2004, 0x2004) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x2004, 0x2004) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -134,8 +134,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( maniach_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ym", ym3526_w) - AM_RANGE(0x2002, 0x2002) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x2002, 0x2002) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index b5ffbe5c6dd..cfa6d986481 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -243,7 +243,7 @@ static ADDRESS_MAP_START(a600xl_mem, ADDRESS_SPACE_PROGRAM, 8) AM_RANGE(0xc000, 0xcfff) AM_ROM /* OS */ AM_RANGE(0xd000, 0xd0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w) AM_RANGE(0xd100, 0xd1ff) AM_NOP - AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE(SOUND, "pokey", pokey_r, pokey_w) + AM_RANGE(0xd200, 0xd2ff) AM_DEVREADWRITE("pokey", pokey_r, pokey_w) AM_RANGE(0xd300, 0xd3ff) AM_READWRITE(pia_0_alt_r, pia_0_alt_w) AM_RANGE(0xd400, 0xd4ff) AM_READWRITE(atari_antic_r, atari_antic_w) AM_RANGE(0xd500, 0xd7ff) AM_NOP diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index c23ad6f3dad..7b59c8d3c2d 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -457,7 +457,7 @@ static void m1_stepper_reset(void) static MACHINE_RESET( m1 ) { ROC10937_reset(0); // reset display1 - maygaym1_devices.duart68681 = device_list_find_by_tag( machine->config->devicelist, DUART68681, "duart68681" ); + maygaym1_devices.duart68681 = devtag_get_device( machine, "duart68681" ); m1_stepper_reset(); } @@ -751,17 +751,17 @@ static ADDRESS_MAP_START( m1_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2040, 0x2041) AM_READWRITE(m1_8279_2_r,m1_8279_2_w) AM_RANGE(0x2050, 0x2050)// SCAN on M1B - AM_RANGE(0x2070, 0x207f) AM_DEVREADWRITE( DUART68681, "duart68681", duart68681_r, duart68681_w ) + AM_RANGE(0x2070, 0x207f) AM_DEVREADWRITE( "duart68681", duart68681_r, duart68681_w ) - AM_RANGE(0x2090, 0x2091) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x20B0, 0x20B0) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x2090, 0x2091) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x20B0, 0x20B0) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0x20A0, 0x20A3) AM_WRITE(pia_0_w) AM_RANGE(0x20A0, 0x20A3) AM_READ( pia_0_r) AM_RANGE(0x20C0, 0x20C7) AM_WRITE(m1_latch_w) - AM_RANGE(0x2400, 0x2401) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE(0x2400, 0x2401) AM_DEVWRITE( "ym", ym2413_w ) AM_RANGE(0x2800, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 6a9453115f1..09629d9e729 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -653,11 +653,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("maincpu", 0x80000) AM_RANGE(0x820000, 0x820003) AM_READWRITE(maygay_8279_r, maygay_8279_w) - AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8( SOUND, "ym", ym2413_w, 0xff00 ) + AM_RANGE(0x800000, 0x800003) AM_DEVWRITE8( "ym", ym2413_w, 0xff00 ) AM_RANGE(0x860000, 0x86000d) AM_READWRITE(read_odd, write_odd) AM_RANGE(0x86000e, 0x86000f) AM_WRITE(vsync_int_ctrl) AM_RANGE(0x880000, 0x89ffff) AM_READWRITE(i82716_r, i82716_w) - AM_RANGE(0x8a0000, 0x8a001f) AM_DEVREADWRITE8( DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff) + AM_RANGE(0x8a0000, 0x8a001f) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff) AM_RANGE(0x8c0000, 0x8c000f) AM_READWRITE(pia_lsb_r, pia_lsb_w) ADDRESS_MAP_END @@ -978,7 +978,7 @@ static MACHINE_START( maygayv1 ) static MACHINE_RESET( maygayv1 ) { // ? - maygayv1_devices.duart68681 = device_list_find_by_tag( machine->config->devicelist, DUART68681, "duart68681" ); + maygayv1_devices.duart68681 = devtag_get_device( machine, "duart68681" ); memset(i82716.dram, 0, 0x40000); i82716.r[RWBA] = 0x0200; } diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 520f30a7c18..591c910f3de 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -95,7 +95,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xc0) AM_WRITE(input_sel_w) AM_RANGE(0xc1, 0xc2) AM_READ(key_matrix_r) // 0xc0-c3 8255ppi AM_RANGE(0xc3, 0xc3) AM_WRITE(SMH_NOP) // 0xc0-c3 8255ppi - AM_RANGE(0xd0, 0xd1) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0xd0, 0xd1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END /****************************************************************************/ diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 8ce1f450d45..83305c41747 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -1110,15 +1110,15 @@ static WRITE8_DEVICE_HANDLER( gg_led_ctrl_w ) static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) - AM_RANGE(0x4000, 0x4000) AM_DEVREAD(SOUND, "ay1", ay8910_r) + AM_RANGE(0x4000, 0x4000) AM_DEVREAD("ay1", ay8910_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x2000, 0x27ff) AM_WRITE(SMH_RAM) /* main RAM (stack) */ - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(sound_int_clear_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(sound_nmi_clear_w) diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 18d1530263b..ec5e936cc76 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -238,14 +238,14 @@ static ADDRESS_MAP_START( mcatadv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mcatadv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(mcatadv_sound_bw_w) ADDRESS_MAP_END @@ -269,8 +269,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nost_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVWRITE(SOUND, "ym", ym2610_w) - AM_RANGE(0x04, 0x07) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0x00, 0x03) AM_DEVWRITE("ym", ym2610_w) + AM_RANGE(0x04, 0x07) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0x40, 0x40) AM_WRITE(mcatadv_sound_bw_w) AM_RANGE(0x80, 0x80) AM_READWRITE(soundlatch_r, soundlatch2_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index 6f5909f91b4..3b94243ec48 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -413,7 +413,7 @@ static WRITE8_HANDLER( kroozr_op4_w ) static WRITE8_HANDLER( journey_op4_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); /* if we're not playing the sample yet, start it */ if (!sample_playing(samples, 0)) @@ -534,7 +534,7 @@ static READ8_HANDLER( nflfoot_ip2_r ) static WRITE8_HANDLER( nflfoot_op4_w ) { - const device_config *sio = devtag_get_device(space->machine, Z80SIO, "ipu_sio"); + const device_config *sio = devtag_get_device(space->machine, "ipu_sio"); /* bit 7 = J3-7 on IPU board = /RXDA on SIO */ logerror("%04X:op4_w(%d%d%d)\n", cpu_get_pc(space->cpu), (data >> 7) & 1, (data >> 6) & 1, (data >> 5) & 1); @@ -629,7 +629,7 @@ static ADDRESS_MAP_START( cpu_90009_portmap, ADDRESS_SPACE_IO, 8 ) SSIO_INPUT_PORTS AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) - AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END @@ -656,7 +656,7 @@ static ADDRESS_MAP_START( cpu_90010_portmap, ADDRESS_SPACE_IO, 8 ) SSIO_INPUT_PORTS AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) - AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END @@ -684,7 +684,7 @@ static ADDRESS_MAP_START( cpu_91490_portmap, ADDRESS_SPACE_IO, 8 ) SSIO_INPUT_PORTS AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) - AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END @@ -706,10 +706,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ipu_91695_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_MIRROR(0xe0) AM_DEVREADWRITE(Z80PIO, "ipu_pio0", z80pio_r, z80pio_w) - AM_RANGE(0x04, 0x07) AM_MIRROR(0xe0) AM_DEVREADWRITE(Z80SIO, "ipu_sio", mcr_ipu_sio_r, mcr_ipu_sio_w) - AM_RANGE(0x08, 0x0b) AM_MIRROR(0xe0) AM_DEVREADWRITE(Z80CTC, "ipu_ctc", z80ctc_r, z80ctc_w) - AM_RANGE(0x0c, 0x0f) AM_MIRROR(0xe0) AM_DEVREADWRITE(Z80PIO, "ipu_pio1", z80pio_r, z80pio_w) + AM_RANGE(0x00, 0x03) AM_MIRROR(0xe0) AM_DEVREADWRITE("ipu_pio0", z80pio_r, z80pio_w) + AM_RANGE(0x04, 0x07) AM_MIRROR(0xe0) AM_DEVREADWRITE("ipu_sio", mcr_ipu_sio_r, mcr_ipu_sio_w) + AM_RANGE(0x08, 0x0b) AM_MIRROR(0xe0) AM_DEVREADWRITE("ipu_ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x0c, 0x0f) AM_MIRROR(0xe0) AM_DEVREADWRITE("ipu_pio1", z80pio_r, z80pio_w) AM_RANGE(0x10, 0x13) AM_MIRROR(0xe0) AM_WRITE(mcr_ipu_laserdisk_w) AM_RANGE(0x1c, 0x1f) AM_MIRROR(0xe0) AM_READWRITE(mcr_ipu_watchdog_r, mcr_ipu_watchdog_w) ADDRESS_MAP_END @@ -1586,7 +1586,7 @@ static MACHINE_DRIVER_START( mcr_91490 ) MDRV_CPU_PROGRAM_MAP(cpu_91490_map,0) MDRV_CPU_IO_MAP(cpu_91490_portmap,0) - MDRV_DEVICE_MODIFY("ctc", Z80CTC) + MDRV_DEVICE_MODIFY("ctc") MDRV_DEVICE_CLOCK(5000000 /* same as "maincpu" */) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index e9cc0316daf..7de85bcaba6 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -475,7 +475,7 @@ static ADDRESS_MAP_START( mcrmono_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_MIRROR(0x78) AM_READ_PORT("MONO.IP4") AM_RANGE(0x05, 0x05) AM_MIRROR(0x78) AM_WRITE(mcrmono_control_port_w) AM_RANGE(0x07, 0x07) AM_MIRROR(0x78) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xf0, 0xf3) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0xf0, 0xf3) AM_MIRROR(0x0c) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END @@ -505,7 +505,7 @@ static ADDRESS_MAP_START( spyhunt_portmap, ADDRESS_SPACE_IO, 8 ) 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(SMH_NOP) - AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 414026b9a69..b177b849cb8 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -334,9 +334,9 @@ static ADDRESS_MAP_START( zwackery_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x080fff) AM_RAM AM_RANGE(0x084000, 0x084fff) AM_RAM AM_RANGE(0x100000, 0x10000f) AM_READWRITE(zwackery_6840_r, mcr68_6840_upper_w) - AM_RANGE(0x104000, 0x104007) AM_DEVREADWRITE8(PIA6821, "pia0", pia_r, pia_w, 0xff00) - AM_RANGE(0x108000, 0x108007) AM_DEVREADWRITE8(PIA6821, "pia1", pia_r, pia_w, 0x00ff) - AM_RANGE(0x10c000, 0x10c007) AM_DEVREADWRITE8(PIA6821, "pia2", pia_r, pia_w, 0x00ff) + AM_RANGE(0x104000, 0x104007) AM_DEVREADWRITE8("pia0", pia_r, pia_w, 0xff00) + AM_RANGE(0x108000, 0x108007) AM_DEVREADWRITE8("pia1", pia_r, pia_w, 0x00ff) + AM_RANGE(0x10c000, 0x10c007) AM_DEVREADWRITE8("pia2", pia_r, pia_w, 0x00ff) AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(zwackery_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(zwackery_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(zwackery_spriteram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 1d6e7ad72b1..429d576a0a7 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -835,20 +835,20 @@ static ADDRESS_MAP_START( mediagx_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START(mediagx_io, ADDRESS_SPACE_IO, 32) - AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8(DMA8237, "dma8237_1", dma8237_r, dma8237_w, 0xffffffff) - AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8(PIC8259, "pic8259_master", io20_r, io20_w, 0xffffffff) - AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8(PIT8254, "pit8254", pit8253_r, pit8253_w, 0xffffffff) + AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", dma8237_r, dma8237_w, 0xffffffff) + AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_master", io20_r, io20_w, 0xffffffff) + AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff) AM_RANGE(0x0060, 0x006f) AM_READWRITE(kbdc8042_32le_r, kbdc8042_32le_w) AM_RANGE(0x0070, 0x007f) AM_READWRITE(mc146818_port32le_r, mc146818_port32le_w) AM_RANGE(0x0080, 0x009f) AM_READWRITE8(at_page8_r, at_page8_w, 0xffffffff) - AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8(PIC8259, "pic8259_slave", pic8259_r, pic8259_w, 0xffffffff) - AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE8(DMA8237, "dma8237_2", at_dma8237_2_r, at_dma8237_2_w, 0xffffffff) + AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8("pic8259_slave", pic8259_r, pic8259_w, 0xffffffff) + AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE8("dma8237_2", at_dma8237_2_r, at_dma8237_2_w, 0xffffffff) AM_RANGE(0x00e8, 0x00eb) AM_NOP // I/O delay port - AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_r, ide_w) + AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE("ide", ide_r, ide_w) AM_RANGE(0x0378, 0x037b) AM_READWRITE(parallel_port_r, parallel_port_w) - AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", fdc_r, fdc_w) + AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE("ide", fdc_r, fdc_w) AM_RANGE(0x0400, 0x04ff) AM_READWRITE(ad1847_r, ad1847_w) - AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE(PCI_BUS, "pcibus", pci_32le_r, pci_32le_w) + AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_32le_r, pci_32le_w) ADDRESS_MAP_END /*****************************************************************************/ @@ -944,11 +944,11 @@ static IRQ_CALLBACK(irq_callback) static MACHINE_START(mediagx) { - mediagx_devices.pit8254 = device_list_find_by_tag( machine->config->devicelist, PIT8254, "pit8254" ); - mediagx_devices.pic8259_1 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_master" ); - mediagx_devices.pic8259_2 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_slave" ); - mediagx_devices.dma8237_1 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_1" ); - mediagx_devices.dma8237_2 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_2" ); + mediagx_devices.pit8254 = devtag_get_device( machine, "pit8254" ); + mediagx_devices.pic8259_1 = devtag_get_device( machine, "pic8259_master" ); + mediagx_devices.pic8259_2 = devtag_get_device( machine, "pic8259_slave" ); + mediagx_devices.dma8237_1 = devtag_get_device( machine, "dma8237_1" ); + mediagx_devices.dma8237_2 = devtag_get_device( machine, "dma8237_2" ); } static MACHINE_RESET(mediagx) @@ -966,10 +966,10 @@ static MACHINE_RESET(mediagx) sound_timer = timer_alloc(machine, sound_timer_callback, NULL); timer_adjust_oneshot(sound_timer, ATTOTIME_IN_MSEC(10), 0); - dmadac[0] = devtag_get_device(machine, SOUND, "dac1"); - dmadac[1] = devtag_get_device(machine, SOUND, "dac2"); + dmadac[0] = devtag_get_device(machine, "dac1"); + dmadac[1] = devtag_get_device(machine, "dac2"); dmadac_enable(&dmadac[0], 2, 1); - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } /************************************************************* @@ -1038,7 +1038,7 @@ static MACHINE_DRIVER_START(mediagx) MDRV_MACHINE_RESET(mediagx) MDRV_PCI_BUS_ADD("pcibus", 0) - MDRV_PCI_BUS_DEVICE(18, NULL, NULL, cx5510_pci_r, cx5510_pci_w) + MDRV_PCI_BUS_DEVICE(18, NULL, cx5510_pci_r, cx5510_pci_w) MDRV_PIT8254_ADD( "pit8254", mediagx_pit8254_config ) diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 4e8c5b992a1..bf5dd27a050 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -1005,8 +1005,8 @@ WRITE16_HANDLER( megadriv_vdp_w ) case 0x12: case 0x14: case 0x16: - if (ACCESSING_BITS_0_7) sn76496_w(devtag_get_device(space->machine, SOUND, "sn"), 0, data & 0xff); - //if (ACCESSING_BITS_8_15) sn76496_w(devtag_get_device(space->machine, SOUND, "sn"), 0, (data >>8) & 0xff); + if (ACCESSING_BITS_0_7) sn76496_w(devtag_get_device(space->machine, "sn"), 0, data & 0xff); + //if (ACCESSING_BITS_8_15) sn76496_w(devtag_get_device(space->machine, "sn"), 0, (data >>8) & 0xff); break; default: @@ -2147,7 +2147,7 @@ static ADDRESS_MAP_START( megadriv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /* (0x000000 - 0x3fffff) == GAME ROM (4Meg Max, Some games have special banking too) */ AM_RANGE(0xa00000 , 0xa01fff) AM_READ(megadriv_68k_read_z80_ram) - AM_RANGE(0xa04000 , 0xa04003) AM_DEVREAD8(SOUND, "ym", megadriv_68k_YM2612_read, 0xffff) + AM_RANGE(0xa04000 , 0xa04003) AM_DEVREAD8("ym", megadriv_68k_YM2612_read, 0xffff) AM_RANGE(0xa10000 , 0xa1001f) AM_READ(megadriv_68k_io_read) @@ -2174,7 +2174,7 @@ static ADDRESS_MAP_START( megadriv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000 , 0xa01fff) AM_WRITE(megadriv_68k_write_z80_ram) AM_RANGE(0xa02000 , 0xa03fff) AM_WRITE(megadriv_68k_write_z80_ram) - AM_RANGE(0xa04000 , 0xa04003) AM_DEVWRITE8(SOUND, "ym", megadriv_68k_YM2612_write, 0xffff) + AM_RANGE(0xa04000 , 0xa04003) AM_DEVWRITE8("ym", megadriv_68k_YM2612_write, 0xffff) AM_RANGE(0xa06000 , 0xa06001) AM_WRITE(megadriv_68k_z80_bank_write) @@ -2344,7 +2344,7 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset ) //logerror("%06x: 68000 start z80 reset (byte MSB access) %04x %04x\n", cpu_get_pc(space->cpu),data,mem_mask); genz80.z80_is_reset=1; cpu_set_input_line(space->machine->cpu[genz80.z80_cpunum], INPUT_LINE_RESET, ASSERT_LINE); - devtag_reset(space->machine, SOUND, "ym"); + devtag_reset(space->machine, "ym"); } } else if (!ACCESSING_BITS_8_15) // is this valid? @@ -2360,7 +2360,7 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset ) //logerror("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", cpu_get_pc(space->cpu),data,mem_mask); genz80.z80_is_reset=1; cpu_set_input_line(space->machine->cpu[genz80.z80_cpunum], INPUT_LINE_RESET, ASSERT_LINE); - devtag_reset(space->machine, SOUND, "ym"); + devtag_reset(space->machine, "ym"); } } @@ -2377,7 +2377,7 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset ) //logerror("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", cpu_get_pc(space->cpu),data,mem_mask); genz80.z80_is_reset=1; cpu_set_input_line(space->machine->cpu[genz80.z80_cpunum], INPUT_LINE_RESET, ASSERT_LINE); - devtag_reset(space->machine, SOUND, "ym"); + devtag_reset(space->machine, "ym"); } } } @@ -2435,7 +2435,7 @@ static WRITE8_HANDLER( megadriv_z80_vdp_write ) case 0x13: case 0x15: case 0x17: - sn76496_w(devtag_get_device(space->machine, SOUND, "sn"), 0, data); + sn76496_w(devtag_get_device(space->machine, "sn"), 0, data); break; default: @@ -2466,7 +2466,7 @@ static WRITE8_HANDLER( z80_write_68k_banked_data ) else if (fulladdress == 0xc00011) { /* quite a few early games write here, most of the later ones don't */ - sn76496_w(devtag_get_device(space->machine, SOUND, "sn"), 0, data); + sn76496_w(devtag_get_device(space->machine, "sn"), 0, data); } else { @@ -2495,7 +2495,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000 , 0x1fff) AM_READ(SMH_BANK1) AM_MIRROR(0x2000) // RAM can be accessed by the 68k - AM_RANGE(0x4000 , 0x4003) AM_DEVREAD(SOUND, "ym", ym2612_r) + AM_RANGE(0x4000 , 0x4003) AM_DEVREAD("ym", ym2612_r) AM_RANGE(0x6100 , 0x7eff) AM_READ(megadriv_z80_unmapped_read) @@ -2506,7 +2506,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000 , 0x1fff) AM_WRITE(SMH_BANK1) AM_MIRROR(0x2000) - AM_RANGE(0x4000 , 0x4003) AM_DEVWRITE(SOUND, "ym", ym2612_w) + AM_RANGE(0x4000 , 0x4003) AM_DEVWRITE("ym", ym2612_w) AM_RANGE(0x7f00 , 0x7fff) AM_WRITE(megadriv_z80_vdp_write) @@ -6567,7 +6567,7 @@ static WRITE8_HANDLER( z80_unmapped_w ) /* sets the megadrive z80 to it's normal ports / map */ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine *machine) { - const device_config *ym = devtag_get_device(machine, SOUND, "ym"); + const device_config *ym = devtag_get_device(machine, "ym"); /* INIT THE PORTS *********************************************************************************************/ memory_install_readwrite8_handler(cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_IO), 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w); diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index e428924986c..9721ae05b40 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -741,7 +741,7 @@ static WRITE8_HANDLER (megaplay_bios_port_be_bf_w) static ADDRESS_MAP_START( megaplay_bios_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // AM_RANGE(0x3f, 0x3f) AM_WRITE(megatech_bios_port_ctrl_w) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE(SOUND, "sn2", sn76496_w) /* SN76489 */ + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("sn2", sn76496_w) /* SN76489 */ // AM_RANGE(0xdc, 0xdc) AM_READ(megatech_bios_port_dc_r) // player inputs // AM_RANGE(0xdd, 0xdd) AM_READ(megatech_bios_port_dd_r) // other player 2 inputs AM_RANGE(0xbe, 0xbf) AM_READWRITE(megaplay_bios_port_be_bf_r, megaplay_bios_port_be_bf_w) /* VDP */ diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 4d230e8658a..b7022b53dd1 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -348,7 +348,7 @@ static ADDRESS_MAP_START( readmem_D, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("DSW") AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(SMH_RAM) AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("SYSTEM") - AM_RANGE(0x0f8000, 0x0f8001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff) + AM_RANGE(0x0f8000, 0x0f8001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff) // { 0x100000, 0x100001 protection AM_RANGE(0x1f0000, 0x1fffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -361,7 +361,7 @@ static ADDRESS_MAP_START( writemem_D, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff) + AM_RANGE(0x0f8000, 0x0f8001) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) // { 0x100000, 0x100001 protection AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram) ADDRESS_MAP_END @@ -447,18 +447,18 @@ static READ8_DEVICE_HANDLER( oki_status_r ) static ADDRESS_MAP_START( sound_readmem_A, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r) - AM_RANGE(0x080000, 0x080003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff) - AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8(SOUND, "oki1", oki_status_r, 0x00ff) - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8(SOUND, "oki2", oki_status_r, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREAD8("ym", ym2151_r, 0x00ff) + AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", oki_status_r, 0x00ff) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", oki_status_r, 0x00ff) 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(SMH_ROM) AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) // to main cpu - AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff) - AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff) + AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff) AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -476,9 +476,9 @@ static ADDRESS_MAP_START( sound_readmem_B, ADDRESS_SPACE_PROGRAM, 16 ) 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(0x080000, 0x080003) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff) - AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8(SOUND, "oki1", oki_status_r, 0x00ff) - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8(SOUND, "oki2", oki_status_r, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVREAD8("ym", ym2151_r, 0x00ff) + AM_RANGE(0x0a0000, 0x0a0001) AM_DEVREAD8("oki1", oki_status_r, 0x00ff) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVREAD8("oki2", oki_status_r, 0x00ff) AM_RANGE(0x0e0000, 0x0effff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -486,9 +486,9 @@ static ADDRESS_MAP_START( sound_writemem_B, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x080003) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff) - AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff) + AM_RANGE(0x080000, 0x080003) AM_DEVWRITE8("ym", ym2151_w, 0x00ff) + AM_RANGE(0x0a0000, 0x0a0003) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff) AM_RANGE(0x0e0000, 0x0effff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -517,7 +517,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END @@ -3806,8 +3806,8 @@ static WRITE16_DEVICE_HANDLER( okim6295_both_w ) static DRIVER_INIT( jitsupro ) { - const device_config *oki1 = devtag_get_device(machine, SOUND, "oki1"); - const device_config *oki2 = devtag_get_device(machine, SOUND, "oki2"); + const device_config *oki1 = devtag_get_device(machine, "oki1"); + const device_config *oki2 = devtag_get_device(machine, "oki2"); UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); astyanax_rom_decode(machine, "maincpu"); // Code diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 6c8cd64bf50..cc70e2bb86e 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -309,7 +309,7 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine *machine) /* INIT THE PORTS *********************************************************************************************/ const address_space *io = cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_IO); - const device_config *sn = devtag_get_device(machine, SOUND, "sn"); + const device_config *sn = devtag_get_device(machine, "sn"); memory_install_readwrite8_handler(io, 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w); @@ -367,7 +367,7 @@ static void megatech_select_game(running_machine *machine, int gameno) cpu_set_input_line(machine->cpu[1], INPUT_LINE_RESET, ASSERT_LINE); cpu_set_input_line(machine->cpu[0], INPUT_LINE_HALT, ASSERT_LINE); cpu_set_input_line(machine->cpu[1], INPUT_LINE_HALT, ASSERT_LINE); - devtag_reset(machine, SOUND, "ym"); + devtag_reset(machine, "ym"); sprintf(tempname, "game%d", gameno); game_region = memory_region(machine, tempname); @@ -587,8 +587,8 @@ static VIDEO_START(mtnew) //attotime_never static VIDEO_UPDATE(mtnew) { - const device_config *megadriv_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "megadriv"); - const device_config *menu_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "menu"); + const device_config *megadriv_screen = devtag_get_device(screen->machine, "megadriv"); + const device_config *menu_screen = devtag_get_device(screen->machine, "menu"); if (screen == megadriv_screen) { diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 9e4c2f0f11f..fdec05783e8 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -69,7 +69,7 @@ static WRITE8_DEVICE_HANDLER( megazone_portB_w ) if (data & 1) C += 10000; /* 10000pF = 0.01uF */ if (data & 2) C += 220000; /* 220000pF = 0.22uF */ data >>= 2; - filter_rc_set_RC(devtag_get_device(device->machine, SOUND, fltname[i]),FLT_RC_LOWPASS,1000,2200,200,CAP_P(C)); + filter_rc_set_RC(devtag_get_device(device->machine, fltname[i]),FLT_RC_LOWPASS,1000,2200,200,CAP_P(C)); } } @@ -135,9 +135,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x00, 0x02) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x00, 0x02) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -150,7 +150,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0xff) AM_READ(soundlatch_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_and_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 74bc0ee46b0..bcc3eaab592 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -162,8 +162,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( meijinsn_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w) AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index b4100a6c446..1fe48f409c9 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -333,10 +333,10 @@ static CUSTOM_INPUT(rndbit_r) static ADDRESS_MAP_START( pitboss_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x67ff) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) @@ -349,10 +349,10 @@ static ADDRESS_MAP_START( casino5_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x7000, 0x7000) AM_WRITE(casino5_bank_w) AM_RANGE(0x7001, 0x7fff) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) @@ -361,10 +361,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bigappg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) @@ -373,10 +373,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dodge_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) @@ -393,73 +393,73 @@ static ADDRESS_MAP_START( trvwhiz_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5400, 0x54ff) AM_WRITE(low_offset_w) AM_RANGE(0x5800, 0x58ff) AM_WRITE(med_offset_w) AM_RANGE(0x6000, 0x67ff) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( trvwhiz_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x8100, 0x8100) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x8100, 0x8100) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( phrcraze_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xa000, 0xbfff) AM_RAM - AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xc00c, 0xc00f) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xc00c, 0xc00f) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0xce00, 0xceff) AM_READWRITE(questions_r, high_offset_w) AM_RANGE(0xd600, 0xd6ff) AM_WRITE(low_offset_w) AM_RANGE(0xda00, 0xdaff) AM_WRITE(med_offset_w) - AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( phrcraze_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xc004, 0xc004) AM_MIRROR(0x1cf3) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xc104, 0xc104) AM_MIRROR(0x1cf3) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0xc004, 0xc004) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xc104, 0xc104) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( tictac_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_RAM - AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xce00, 0xceff) AM_READWRITE(questions_r, high_offset_w) AM_RANGE(0xd600, 0xd6ff) AM_WRITE(low_offset_w) AM_RANGE(0xda00, 0xdaff) AM_WRITE(med_offset_w) - AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( tictac_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xc00c, 0xc00c) AM_MIRROR(0x1cf3) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xc10c, 0xc10c) AM_MIRROR(0x1cf3) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0xc00c, 0xc00c) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xc10c, 0xc10c) AM_MIRROR(0x1cf3) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( trvwhziv_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xa000, 0xbfff) AM_RAM - AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xce00, 0xceff) AM_READWRITE(questions_r, high_offset_w) AM_RANGE(0xd600, 0xd6ff) AM_WRITE(low_offset_w) AM_RANGE(0xda00, 0xdaff) AM_WRITE(med_offset_w) - AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x05f0) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) @@ -469,10 +469,10 @@ static ADDRESS_MAP_START( couple_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&backup_ram) - AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w) @@ -1093,7 +1093,7 @@ INPUT_PORTS_END static VIDEO_UPDATE( merit ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = devtag_get_device(screen->machine, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; @@ -1269,9 +1269,9 @@ static MACHINE_DRIVER_START( couple ) MDRV_CPU_PROGRAM_MAP(couple_map,0) MDRV_CPU_IO_MAP(tictac_io_map,0) - MDRV_DEVICE_MODIFY("ppi8255_0", PPI8255) + MDRV_DEVICE_MODIFY("ppi8255_0") MDRV_DEVICE_CONFIG( ppi8255_couple_intf[0]) - MDRV_DEVICE_MODIFY("ppi8255_1", PPI8255) + MDRV_DEVICE_MODIFY("ppi8255_1") MDRV_DEVICE_CONFIG( ppi8255_couple_intf[1]) MACHINE_DRIVER_END diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 7ca3acf0280..135cde32876 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -559,11 +559,11 @@ static ADDRESS_MAP_START( meritm_crt250_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READWRITE(v9938_1_status_r, v9938_1_command_w) AM_RANGE(0x22, 0x22) AM_WRITE(v9938_1_palette_w) AM_RANGE(0x23, 0x23) AM_WRITE(v9938_1_register_w) - AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) - AM_RANGE(0x40, 0x43) AM_DEVREADWRITE(Z80PIO, "z80pio_0", z80pio_r, z80pio_w) - AM_RANGE(0x50, 0x53) AM_DEVREADWRITE(Z80PIO, "z80pio_1", z80pio_r, z80pio_w) - AM_RANGE(0x80, 0x80) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_r, z80pio_w) + AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_r, z80pio_w) + AM_RANGE(0x80, 0x80) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w) ADDRESS_MAP_END @@ -585,12 +585,12 @@ static ADDRESS_MAP_START( meritm_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READWRITE(v9938_1_status_r, v9938_1_command_w) AM_RANGE(0x22, 0x22) AM_WRITE(v9938_1_palette_w) AM_RANGE(0x23, 0x23) AM_WRITE(v9938_1_register_w) - AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) - AM_RANGE(0x40, 0x43) AM_DEVREADWRITE(Z80PIO, "z80pio_0", z80pio_r, z80pio_w) - AM_RANGE(0x50, 0x53) AM_DEVREADWRITE(Z80PIO, "z80pio_1", z80pio_r, z80pio_w) + AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_r, z80pio_w) + AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_r, z80pio_w) AM_RANGE(0x60, 0x67) AM_READWRITE(pc16552d_0_r,pc16552d_0_w) - AM_RANGE(0x80, 0x80) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x80, 0x80) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xff, 0xff) AM_WRITE(meritm_bank_w) ADDRESS_MAP_END @@ -826,15 +826,15 @@ static const z80pio_interface meritm_io_pio_intf = static const z80_daisy_chain meritm_daisy_chain[] = { - { Z80PIO, "z80pio_1" }, - { Z80PIO, "z80pio_0" }, + { "z80pio_1" }, + { "z80pio_0" }, { NULL } }; static MACHINE_START(merit_common) { - meritm_z80pio[0] = devtag_get_device( machine, Z80PIO, "z80pio_0" ); - meritm_z80pio[1] = devtag_get_device( machine, Z80PIO, "z80pio_1" ); + meritm_z80pio[0] = devtag_get_device( machine, "z80pio_0" ); + meritm_z80pio[1] = devtag_get_device( machine, "z80pio_1" ); }; diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index 09fc025139b..104886c373f 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -144,14 +144,14 @@ static UINT8 *mermaid_ay8910_enable; static WRITE8_HANDLER( mermaid_ay8910_write_port_w ) { - if (mermaid_ay8910_enable[0]) ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay1"), offset, data); - if (mermaid_ay8910_enable[1]) ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay2"), offset, data); + if (mermaid_ay8910_enable[0]) ay8910_data_w(devtag_get_device(space->machine, "ay1"), offset, data); + if (mermaid_ay8910_enable[1]) ay8910_data_w(devtag_get_device(space->machine, "ay2"), offset, data); } static WRITE8_HANDLER( mermaid_ay8910_control_port_w ) { - if (mermaid_ay8910_enable[0]) ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay1"), offset, data); - if (mermaid_ay8910_enable[1]) ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay2"), offset, data); + if (mermaid_ay8910_enable[0]) ay8910_address_w(devtag_get_device(space->machine, "ay1"), offset, data); + if (mermaid_ay8910_enable[1]) ay8910_address_w(devtag_get_device(space->machine, "ay2"), offset, data); } diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index ee4ab81a3dc..2730d13ca0d 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -82,7 +82,7 @@ static ADDRESS_MAP_START( metlclsh_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW") // AM_RANGE(0xc800, 0xc82f) AM_READ(SMH_RAM ) // not actually read // AM_RANGE(0xcc00, 0xcc2f) AM_READ(SMH_RAM ) // "" - AM_RANGE(0xd000, 0xd001) AM_DEVREAD(SOUND, "ym1", ym2203_r ) + AM_RANGE(0xd000, 0xd001) AM_DEVREAD("ym1", ym2203_r ) // 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 @@ -97,8 +97,8 @@ static ADDRESS_MAP_START( metlclsh_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc0c3, 0xc0c3) AM_WRITE(metlclsh_ack_nmi ) // nmi ack AM_RANGE(0xc800, 0xc82f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram ) AM_RANGE(0xcc00, 0xcc2f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2 ) - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "ym1", ym2203_w ) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym2", ym3526_w ) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ym1", ym2203_w ) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym2", ym3526_w ) 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(SMH_ROM ) diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index d4b26aa78e4..266b3de7376 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -441,7 +441,7 @@ static WRITE8_HANDLER( metro_portb_w ) { if (!BIT(data,2)) { - const device_config *ym = devtag_get_device(space->machine, SOUND, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ym"); ym2413_w(ym,BIT(data,1),porta); } portb = data; @@ -452,7 +452,7 @@ static WRITE8_HANDLER( metro_portb_w ) { /* write */ if (!BIT(data,4)) - okim6295_w(devtag_get_device(space->machine, SOUND, "oki"),0,porta); + okim6295_w(devtag_get_device(space->machine, "oki"),0,porta); } portb = data; } @@ -480,7 +480,7 @@ static WRITE8_HANDLER( daitorid_portb_w ) if (BIT(portb,6) && !BIT(data,6)) /* clock 1->0 */ { - const device_config *ym = devtag_get_device(space->machine, SOUND, "ym"); + const device_config *ym = devtag_get_device(space->machine, "ym"); if (!BIT(data,2)) { /* write */ @@ -499,13 +499,13 @@ static WRITE8_HANDLER( daitorid_portb_w ) { /* write */ if (!BIT(data,4)) - okim6295_w(devtag_get_device(space->machine, SOUND, "oki"),0,porta); + okim6295_w(devtag_get_device(space->machine, "oki"),0,porta); } if (BIT(portb,3) && !BIT(data,3)) /* clock 1->0 */ { /* read */ if (!BIT(data,4)) - porta = okim6295_r(devtag_get_device(space->machine, SOUND, "oki"),0); + porta = okim6295_r(devtag_get_device(space->machine, "oki"),0); } portb = data; } @@ -897,7 +897,7 @@ static READ16_HANDLER( balcube_dsw_r ) static ADDRESS_MAP_START( balcube_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300001) AM_DEVREAD8(SOUND, "ymf", ymf278b_r, 0x00ff) // Sound + AM_RANGE(0x300000, 0x300001) AM_DEVREAD8("ymf", ymf278b_r, 0x00ff) // Sound AM_RANGE(0x400000, 0x41ffff) AM_READ(balcube_dsw_r ) // DSW x 3 AM_RANGE(0x600000, 0x61ffff) AM_READ(SMH_RAM ) // Layer 0 AM_RANGE(0x620000, 0x63ffff) AM_READ(SMH_RAM ) // Layer 1 @@ -915,7 +915,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( balcube_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x30000b) AM_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0x00ff) // Sound + AM_RANGE(0x300000, 0x30000b) AM_DEVWRITE8("ymf", ymf278b_w, 0x00ff) // Sound AM_RANGE(0x500002, 0x500009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout AM_RANGE(0x670000, 0x673fff) AM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w ) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x674000, 0x674fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites @@ -943,7 +943,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daitoa_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_DEVREAD8(SOUND, "ymf", ymf278b_r, 0x00ff) // Sound + AM_RANGE(0x400000, 0x400001) AM_DEVREAD8("ymf", ymf278b_r, 0x00ff) // Sound AM_RANGE(0x300000, 0x31ffff) AM_READ(balcube_dsw_r ) // DSW x 3 AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM ) // Layer 0 AM_RANGE(0x120000, 0x13ffff) AM_READ(SMH_RAM ) // Layer 1 @@ -961,7 +961,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daitoa_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x400000, 0x40000b) AM_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0x00ff) // Sound + AM_RANGE(0x400000, 0x40000b) AM_DEVWRITE8("ymf", ymf278b_w, 0x00ff) // Sound AM_RANGE(0x200002, 0x200009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout AM_RANGE(0x170000, 0x173fff) AM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w ) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x174000, 0x174fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites @@ -990,7 +990,7 @@ static ADDRESS_MAP_START( bangball_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "ymf", ymf278b_r, 0x00ff) // Sound + AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("ymf", ymf278b_r, 0x00ff) // Sound AM_RANGE(0xc00000, 0xc1ffff) AM_READ(balcube_dsw_r ) // DSW x 3 AM_RANGE(0xd00000, 0xd00001) AM_READ_PORT("IN0") // Inputs AM_RANGE(0xd00002, 0xd00003) AM_READ_PORT("IN1") // @@ -1009,7 +1009,7 @@ static ADDRESS_MAP_START( bangball_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0x00ff) // Sound + AM_RANGE(0xb00000, 0xb0000b) AM_DEVWRITE8("ymf", ymf278b_w, 0x00ff) // 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 @@ -1048,7 +1048,7 @@ static ADDRESS_MAP_START( batlbubl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200004, 0x200005) AM_READ_PORT("IN0") AM_RANGE(0x200006, 0x200007) AM_READ_PORT("IN2") AM_RANGE(0x300000, 0x31ffff) AM_READ(balcube_dsw_r ) // read but ignored? - AM_RANGE(0x400000, 0x400001) AM_DEVREAD8(SOUND, "ymf", ymf278b_r, 0x00ff) // Sound + AM_RANGE(0x400000, 0x400001) AM_DEVREAD8("ymf", ymf278b_r, 0x00ff) // Sound 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 @@ -1072,7 +1072,7 @@ static ADDRESS_MAP_START( batlbubl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0x00ff) // Sound + AM_RANGE(0x400000, 0x40000b) AM_DEVWRITE8("ymf", ymf278b_w, 0x00ff) // Sound AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xf10000, 0xf10fff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1460,7 +1460,7 @@ static ADDRESS_MAP_START( gakusai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x278882, 0x278883) AM_READ_PORT("IN0") // AM_RANGE(0x27880e, 0x27880f) AM_READ(SMH_RAM ) // Screen Control - AM_RANGE(0x700000, 0x700001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0x700000, 0x700001) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) // Sound AM_RANGE(0xc00000, 0xc00001) AM_READ(gakusai_eeprom_r ) // EEPROM ADDRESS_MAP_END @@ -1486,11 +1486,11 @@ static ADDRESS_MAP_START( gakusai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki", gakusai_oki_bank_lo_w ) // Sound - AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x700000, 0x700001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff ) + AM_RANGE(0x500000, 0x500001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w ) // Sound + AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x700000, 0x700001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff ) AM_RANGE(0xc00000, 0xc00001) AM_WRITE(gakusai_eeprom_w ) // EEPROM - AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE(SOUND, "oki", gakusai_oki_bank_hi_w ) + AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE("oki", gakusai_oki_bank_hi_w ) ADDRESS_MAP_END @@ -1513,7 +1513,7 @@ static ADDRESS_MAP_START( gakusai2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x678880, 0x678881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x678882, 0x678883) AM_READ_PORT("IN0") // AM_RANGE(0x67880e, 0x67880f) AM_READ(SMH_RAM ) // Screen Control - AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) // Sound AM_RANGE(0xe00000, 0xe00001) AM_READ(gakusai_eeprom_r ) // EEPROM ADDRESS_MAP_END @@ -1540,10 +1540,10 @@ static ADDRESS_MAP_START( gakusai2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki", gakusai_oki_bank_lo_w ) // Sound - AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE(SOUND, "oki", gakusai_oki_bank_hi_w ) - AM_RANGE(0xb00000, 0xb00001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff ) - AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) + AM_RANGE(0x900000, 0x900001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w ) // Sound + AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE("oki", gakusai_oki_bank_hi_w ) + AM_RANGE(0xb00000, 0xb00001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff ) + AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) AM_RANGE(0xe00000, 0xe00001) AM_WRITE(gakusai_eeprom_w ) // EEPROM ADDRESS_MAP_END @@ -1597,7 +1597,7 @@ static ADDRESS_MAP_START( dokyusp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x278882, 0x278883) AM_READ_PORT("IN0") // AM_RANGE(0x27880e, 0x27880f) AM_READ(SMH_RAM ) // Screen Control - AM_RANGE(0x700000, 0x700001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0x700000, 0x700001) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) // Sound AM_RANGE(0xd00000, 0xd00001) AM_READ(dokyusp_eeprom_r ) // EEPROM ADDRESS_MAP_END @@ -1623,9 +1623,9 @@ static ADDRESS_MAP_START( dokyusp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki", gakusai_oki_bank_lo_w ) // Sound - AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x700000, 0x700001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x500000, 0x500001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w ) // Sound + AM_RANGE(0x600000, 0x600003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x700000, 0x700001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xc00000, 0xc00001) AM_WRITE(dokyusp_eeprom_reset_w ) // EEPROM AM_RANGE(0xd00000, 0xd00001) AM_WRITE(dokyusp_eeprom_bit_w ) // EEPROM ADDRESS_MAP_END @@ -1650,7 +1650,7 @@ static ADDRESS_MAP_START( dokyusei_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x478882, 0x478883) AM_READ_PORT("IN0") // AM_RANGE(0x478884, 0x478885) AM_READ_PORT("DSW0") // 2 x DSW AM_RANGE(0x478886, 0x478887) AM_READ_PORT("DSW1") // - AM_RANGE(0xd00000, 0xd00001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0xd00000, 0xd00001) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( dokyusei_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1675,11 +1675,11 @@ static ADDRESS_MAP_START( dokyusei_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki", gakusai_oki_bank_hi_w ) // Samples Bank? + AM_RANGE(0x800000, 0x800001) AM_DEVWRITE("oki", gakusai_oki_bank_hi_w ) // Samples Bank? AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP ) // ? 4 - AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE(SOUND, "oki", gakusai_oki_bank_lo_w ) // Samples Bank - AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) // - AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff ) // + AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE("oki", gakusai_oki_bank_lo_w ) // Samples Bank + AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // + AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff ) // ADDRESS_MAP_END @@ -1965,14 +1965,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r) - AM_RANGE(0x80, 0x83) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0x80, 0x83) AM_DEVREAD("ym", ym2610_r) 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(SMH_NOP) - AM_RANGE(0x80, 0x83) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0x80, 0x83) AM_DEVWRITE("ym", ym2610_w) ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2045,7 +2045,7 @@ static ADDRESS_MAP_START( mouja_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x478882, 0x478883) AM_READ_PORT("IN1") // AM_RANGE(0x478884, 0x478885) AM_READ_PORT("DSW0") // AM_RANGE(0x478886, 0x478887) AM_READ_PORT("IN2") // - AM_RANGE(0xd00000, 0xd00001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0xd00000, 0xd00001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) #if 0 AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r ) // Banked ROM #endif @@ -2071,9 +2071,9 @@ static ADDRESS_MAP_START( mouja_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0xc00003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x800000, 0x800001) AM_DEVWRITE(SOUND, "oki", mouja_sound_rombank_w ) - AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff ) + AM_RANGE(0xc00000, 0xc00003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x800000, 0x800001) AM_DEVWRITE("oki", mouja_sound_rombank_w ) + AM_RANGE(0xd00000, 0xd00001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff ) #if 0 AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter @@ -2099,8 +2099,8 @@ static ADDRESS_MAP_START( puzzlet_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x430000, 0x433fff ) AM_RAM AM_RANGE( 0x470000, 0x47dfff ) AM_RAM - AM_RANGE( 0x500000, 0x500001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0xff00 ) - AM_RANGE( 0x580000, 0x580003 ) AM_DEVWRITE8( SOUND, "ym", ym2413_w, 0xff00 ) + AM_RANGE( 0x500000, 0x500001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0xff00 ) + AM_RANGE( 0x580000, 0x580003 ) AM_DEVWRITE8( "ym", ym2413_w, 0xff00 ) 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 diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index 68f493c962c..a10af81d88b 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -102,14 +102,14 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xa7ff) AM_READ(shared_r) AM_RANGE(0xa800, 0xbfff) AM_READ(SMH_RAM) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", kiki_ym2203_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", kiki_ym2203_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0xa7ff) AM_WRITE(shared_w) AM_RANGE(0xa800, 0xbfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index ba6d20ab742..84a50dec88e 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -205,9 +205,9 @@ static READ8_HANDLER( dual_pokey_r ) int pokey_reg = (offset % 8) | control; if (pokey_num == 0) - return pokey_r(devtag_get_device(space->machine, SOUND, "pokey1"), pokey_reg); + return pokey_r(devtag_get_device(space->machine, "pokey1"), pokey_reg); else - return pokey_r(devtag_get_device(space->machine, SOUND, "pokey2"), pokey_reg); + return pokey_r(devtag_get_device(space->machine, "pokey2"), pokey_reg); } @@ -218,9 +218,9 @@ static WRITE8_HANDLER( dual_pokey_w ) int pokey_reg = (offset % 8) | control; if (pokey_num == 0) - pokey_w(devtag_get_device(space->machine, SOUND, "pokey1"), pokey_reg, data); + pokey_w(devtag_get_device(space->machine, "pokey1"), pokey_reg, data); else - pokey_w(devtag_get_device(space->machine, SOUND, "pokey2"), pokey_reg, data); + pokey_w(devtag_get_device(space->machine, "pokey2"), pokey_reg, data); } diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 102aaf35852..4c85c328810 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -524,7 +524,7 @@ static WRITE8_HANDLER( sound_io_w ) } case 0x03: { - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd7759"); + const device_config *upd = devtag_get_device(space->machine, "upd7759"); upd7759_set_bank_base(upd, (data & 0x4) ? 0x20000 : 0); upd7759_reset_w(upd, (data & 0x10) ? 0 : 1); break; @@ -537,7 +537,7 @@ static READ8_HANDLER( sound_io_r ) switch (offset) { case 0x01: return (sound_port_latch[offset] & 0x7f) | input_port_read_safe(space->machine, "SOUND_SW", 0); - case 0x03: return (sound_port_latch[offset] & 0xf7) | (upd7759_busy_r(devtag_get_device(space->machine, SOUND, "upd7759")) ? 0x08 : 0); + case 0x03: return (sound_port_latch[offset] & 0xf7) | (upd7759_busy_r(devtag_get_device(space->machine, "upd7759")) ? 0x08 : 0); default: return 0; } } @@ -568,7 +568,7 @@ static ADDRESS_MAP_START( hostmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(tms_host_r, tms_host_w) AM_RANGE(0x9c0000, 0x9c0001) AM_NOP /* ????? Write: 80, A0 and 00 (8-bit high byte) */ AM_RANGE(0x9e0000, 0x9e00cf) AM_RAM_WRITE(m68901_w) AM_BASE(&m68901_base) - AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8(DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff00) + AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8("duart68681", duart68681_r, duart68681_w, 0xff00) AM_RANGE(0xa20000, 0xa20001) AM_RAM /* XY joystick input - sign? */ AM_RANGE(0xa40002, 0xa40003) AM_RAM /* XY joystick input - actual values */ ADDRESS_MAP_END @@ -596,8 +596,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( soundmem_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0xfd00, 0xfd01) AM_DEVREADWRITE(SOUND, "ym2151", ym2151_r, ym2151_w) - AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE(SOUND, "upd7759", upd7759_port_start_w) + AM_RANGE(0xfd00, 0xfd01) AM_DEVREADWRITE("ym2151", ym2151_r, ym2151_w) + AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE("upd7759", upd7759_port_start_w) AM_RANGE(0xff00, 0xff00) AM_NOP /* DAC A */ AM_RANGE(0xff01, 0xff01) AM_NOP /* DAC B */ AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(sound_io_r,sound_io_w) @@ -695,7 +695,7 @@ static DRIVER_INIT( micro3d ) i8051_set_serial_tx_callback(machine->cpu[2], data_from_i8031); i8051_set_serial_rx_callback(machine->cpu[2], data_to_i8031); - duart68681 = device_list_find_by_tag( machine->config->devicelist, DUART68681, "duart68681" ); + duart68681 = devtag_get_device( machine, "duart68681" ); } static DRIVER_INIT( stankatk ) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 2f85bc6c101..4848446df17 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -238,7 +238,7 @@ static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb40000, 0xb40001) AM_READ( ret_ffff ) AM_RANGE(0xb60000, 0xb60001) AM_READ( ret_ffff ) - AM_RANGE(0xb80008, 0xb8000b) AM_DEVREADWRITE8( SOUND, "ymz", ymz280b_r, ymz280b_w, 0x00ff ) + AM_RANGE(0xb80008, 0xb8000b) AM_DEVREADWRITE8( "ymz", ymz280b_r, ymz280b_w, 0x00ff ) AM_RANGE(0xba0000, 0xba0001) AM_READ_PORT("IN4") AM_RANGE(0xbc0000, 0xbc0001) AM_READ_PORT("IN3") diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 570ba2060c5..51f8f531452 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -92,7 +92,7 @@ static MACHINE_RESET( midvplus ) timer[0] = timer_alloc(machine, NULL, NULL); timer[1] = timer_alloc(machine, NULL, NULL); - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } @@ -527,7 +527,7 @@ static ADDRESS_MAP_START( midvplus_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x990000, 0x99000f) AM_READWRITE(midway_ioasic_r, midway_ioasic_w) AM_RANGE(0x994000, 0x994000) AM_WRITE(midvunit_control_w) AM_RANGE(0x995020, 0x995020) AM_WRITE(midvunit_cmos_protect_w) - AM_RANGE(0x9a0000, 0x9a0007) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", midway_ide_asic_r, midway_ide_asic_w) + AM_RANGE(0x9a0000, 0x9a0007) AM_DEVREADWRITE("ide", midway_ide_asic_r, midway_ide_asic_w) AM_RANGE(0x9c0000, 0x9c7fff) AM_RAM_WRITE(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) diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c index 35b8bde6c06..b4ce3132f2b 100644 --- a/src/mame/drivers/midyunit.c +++ b/src/mame/drivers/midyunit.c @@ -212,8 +212,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( yawdim_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x9000, 0x97ff) AM_DEVWRITE(SOUND, "oki", yawdim_oki_bank_w) - AM_RANGE(0x9800, 0x9fff) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x9000, 0x97ff) AM_DEVWRITE("oki", yawdim_oki_bank_w) + AM_RANGE(0x9800, 0x9fff) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa7ff) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index 8d65f2edcfe..90b090f8496 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -605,7 +605,7 @@ static ADDRESS_MAP_START( zeus2_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x990000, 0x99000f) AM_READWRITE(midway_ioasic_r, midway_ioasic_w) AM_RANGE(0x9c0000, 0x9c000f) AM_READWRITE(analog_r, analog_w) AM_RANGE(0x9e0000, 0x9e0000) AM_WRITENOP // watchdog? - AM_RANGE(0x9f0000, 0x9f7fff) AM_DEVREADWRITE(M48T35, "m48t35", zeus2_timekeeper_r, zeus2_timekeeper_w) + AM_RANGE(0x9f0000, 0x9f7fff) AM_DEVREADWRITE("m48t35", zeus2_timekeeper_r, zeus2_timekeeper_w) AM_RANGE(0x9f8000, 0x9f8000) AM_WRITE(cmos_protect_w) AM_RANGE(0xa00000, 0xbfffff) AM_ROM AM_REGION("user1", 0) AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK(1) AM_REGION("user2", 0) diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index 9bccaa8138b..e176504becf 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -91,9 +91,9 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_RANGE(0x8000, 0x8000) AM_WRITENOP // sound command latch AM_RANGE(0x8001, 0x8001) AM_WRITENOP // ??? - AM_RANGE(0x8002, 0x8002) AM_DEVWRITE(SOUND, "sn1", sn76496_w) // trigger read of latch + AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76496_w) // trigger read of latch AM_RANGE(0x8003, 0x8003) AM_READ(soundlatch_r) - AM_RANGE(0x8004, 0x8004) AM_DEVWRITE(SOUND, "sn2", sn76496_w) // trigger read of latch + AM_RANGE(0x8004, 0x8004) AM_DEVWRITE("sn2", sn76496_w) // trigger read of latch AM_RANGE(0x8005, 0x8005) AM_READ(mikie_sh_timer_r) AM_RANGE(0x8079, 0x8079) AM_WRITENOP // ??? AM_RANGE(0xa003, 0xa003) AM_WRITENOP // ??? diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index f70c110a329..77012239bb2 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -251,7 +251,7 @@ static ADDRESS_MAP_START( mil4000_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x708006, 0x708007) AM_READ_PORT("IN2") AM_RANGE(0x708008, 0x708009) AM_WRITE(output_w) AM_RANGE(0x708010, 0x708011) AM_NOP //touch screen - AM_RANGE(0x70801e, 0x70801f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x70801e, 0x70801f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x780000, 0x780fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // 2x CY62256L-70 (U7 & U8). diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 1388e587cdd..afbd11d45af 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -187,8 +187,8 @@ static ADDRESS_MAP_START( miniboy7_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(miniboy7_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1800, 0x25ff) AM_RAM /* looks like videoram */ AM_RANGE(0x2600, 0x27ff) AM_RAM - AM_RANGE(0x2800, 0x2800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x2801, 0x2801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x2800, 0x2800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x2801, 0x2801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) // AM_RANGE(0x3000, 0x3001) ????? R/W // AM_RANGE(0x3080, 0x3083) AM_READWRITE(pia_0_r, pia_0_w) // AM_RANGE(0x3800, 0x3800) ????? R diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 858af3aad4a..9400e7ce4da 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -212,8 +212,8 @@ static ADDRESS_MAP_START( mirage_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x130000, 0x1307ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x140000, 0x14000f) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x150000, 0x15000f) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x140000, 0x14000f) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x150000, 0x15000f) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x160000, 0x160001) AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index be8053b76cc..f36d620dfce 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -124,11 +124,11 @@ static ADDRESS_MAP_START( memory_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(snd_read) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "ay1", ay_sel) //1st ay ? + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("ay1", ay_sel) //1st ay ? AM_RANGE(0xe001, 0xe001) AM_WRITENOP AM_RANGE(0xe003, 0xe003) AM_WRITENOP - AM_RANGE(0xe400, 0xe400) AM_DEVWRITE(SOUND, "ay2", ay_sel) //2nd ay ? + AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("ay2", ay_sel) //2nd ay ? AM_RANGE(0xe401, 0xe401) AM_WRITENOP AM_RANGE(0xe403, 0xe403) AM_WRITENOP diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 254310434fc..54719af11f1 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -182,8 +182,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym3526_r, ym3526_w) + AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3526_r, ym3526_w) AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITENOP // message for main cpu AM_RANGE(0xb001, 0xb001) AM_READNOP AM_WRITE(bublbobl_sh_nmi_enable_w) // bit 0: message pending for main cpu, bit 1: message pending for sound cpu AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w) diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index a945405da7c..5a1d21a03e8 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -679,7 +679,7 @@ static WRITE8_HANDLER( missile_w ) /* POKEY */ else if (offset < 0x4800) - pokey_w(devtag_get_device(space->machine, SOUND, "pokey"), offset & 0x0f, data); + pokey_w(devtag_get_device(space->machine, "pokey"), offset & 0x0f, data); /* OUT0 */ else if (offset < 0x4900) @@ -738,7 +738,7 @@ static READ8_HANDLER( missile_r ) /* POKEY */ else if (offset < 0x4800) - result = pokey_r(devtag_get_device(space->machine, SOUND, "pokey"), offset & 0x0f); + result = pokey_r(devtag_get_device(space->machine, "pokey"), offset & 0x0f); /* IN0 */ else if (offset < 0x4900) diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index bb3f2af3256..7891e6a1ecf 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -391,9 +391,9 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) The Mahjong games and Block Block need special input treatment */ AM_RANGE(0x01, 0x01) AM_WRITE(input_w) AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */ - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "ym", ym2413_data_port_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "ym", ym2413_register_port_w) - AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("ym", ym2413_data_port_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ym", ym2413_register_port_w) + AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) AM_DEVWRITE("oki", okim6295_w) 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) @@ -418,8 +418,8 @@ static ADDRESS_MAP_START( spangb_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x02) AM_READ(input_r) /* Super Pang needs a kludge to initialize EEPROM. */ AM_RANGE(0x00, 0x00) AM_WRITE(pang_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_DEVWRITE(SOUND, "ym", ym2413_data_port_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "ym", ym2413_register_port_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("ym", ym2413_data_port_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ym", ym2413_register_port_w) AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) 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 */ @@ -459,15 +459,15 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w ) static ADDRESS_MAP_START( mstworld_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "oki", oki_banking_w) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", oki_banking_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END static WRITE8_HANDLER(mstworld_sound_w) diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index b9cd86dc300..62c4730ec38 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -197,8 +197,8 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(mjkjidai_ctrl_w) // rom bank, coin counter, flip screen etc AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0") AM_RANGE(0x12, 0x12) AM_READ_PORT("IN1") - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x30, 0x30) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x30, 0x30) AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0x40, 0x40) AM_WRITE(adpcm_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 5fab2cceede..ece4dc0dcf1 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -38,7 +38,7 @@ static TIMER_CALLBACK( dac_callback ) { UINT8 *DACROM = memory_region(machine, "samples"); - dac_data_w(devtag_get_device(machine, SOUND, "dac"),DACROM[(dac_bank * 0x10000 + dac_adr++) & 0x1ffff]); + dac_data_w(devtag_get_device(machine, "dac"),DACROM[(dac_bank * 0x10000 + dac_adr++) & 0x1ffff]); if (((dac_adr & 0xff00 ) >> 8) != dac_adr_e ) timer_set(machine, attotime_mul(ATTOTIME_IN_HZ(MCLK), 1024), NULL, 0, dac_callback); @@ -166,9 +166,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjsister_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_WRITE(SMH_NOP) /* HD46505? */ - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x11, 0x11) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x12, 0x12) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x11, 0x11) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x12, 0x12) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x20, 0x20) AM_READ(mjsister_keys_r) AM_RANGE(0x21, 0x21) AM_READ_PORT("IN0") AM_RANGE(0x30, 0x30) AM_WRITE(mjsister_banksel1_w) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index bead00892cc..8f18c91083e 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -158,14 +158,14 @@ static ADDRESS_MAP_START( mlanding_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) 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) AM_RANGE(0xb000, 0xb000) AM_WRITE(ml_msm5205_address_w) //guess - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "msm", ml_msm5205_start_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "msm", ml_msm5205_stop_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("msm", ml_msm5205_start_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("msm", ml_msm5205_stop_w) AM_RANGE(0xf400, 0xf400) AM_WRITENOP AM_RANGE(0xf600, 0xf600) AM_WRITENOP diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 24414d4e981..8f933416437 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -992,12 +992,12 @@ static ADDRESS_MAP_START( model1_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0xc20000, 0xc20001) AM_READWRITE( m1_snd_68k_latch_r, m1_snd_68k_latch1_w ) AM_RANGE(0xc20002, 0xc20003) AM_READWRITE( m1_snd_v60_ready_r, m1_snd_68k_latch2_w ) - AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8( SOUND, "sega1", multipcm_r, multipcm_w, 0x00ff ) + AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8( "sega1", multipcm_r, multipcm_w, 0x00ff ) AM_RANGE(0xc40012, 0xc40013) AM_WRITENOP - AM_RANGE(0xc50000, 0xc50001) AM_DEVWRITE( SOUND, "sega1", m1_snd_mpcm_bnk_w ) - AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8( SOUND, "sega2", multipcm_r, multipcm_w, 0x00ff ) - AM_RANGE(0xc70000, 0xc70001) AM_DEVWRITE( SOUND, "sega2", m1_snd_mpcm_bnk_w ) - AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( SOUND, "ym", ym3438_r, ym3438_w, 0x00ff ) + AM_RANGE(0xc50000, 0xc50001) AM_DEVWRITE( "sega1", m1_snd_mpcm_bnk_w ) + AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8( "sega2", multipcm_r, multipcm_w, 0x00ff ) + AM_RANGE(0xc70000, 0xc70001) AM_DEVWRITE( "sega2", m1_snd_mpcm_bnk_w ) + AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( "ym", ym3438_r, ym3438_w, 0x00ff ) AM_RANGE(0xf00000, 0xf0ffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index aed072ae917..5d5a62086e8 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -924,7 +924,7 @@ static WRITE32_HANDLER( model2_serial_w ) { if (ACCESSING_BITS_0_7 && (offset == 0)) { - scsp_midi_in(devtag_get_device(space->machine, SOUND, "scsp"), 0, data&0xff, 0); + scsp_midi_in(devtag_get_device(space->machine, "scsp"), 0, data&0xff, 0); // give the 68k time to notice cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(40)); @@ -1600,12 +1600,12 @@ static ADDRESS_MAP_START( model1_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x0bffff) AM_ROM AM_REGION("audiocpu", 0x20000) // mirror of second program ROM AM_RANGE(0xc20000, 0xc20001) AM_READWRITE( m1_snd_68k_latch_r, m1_snd_68k_latch1_w ) AM_RANGE(0xc20002, 0xc20003) AM_READWRITE( m1_snd_v60_ready_r, m1_snd_68k_latch2_w ) - AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8( SOUND, "sega1", multipcm_r, multipcm_w, 0x00ff ) + AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8( "sega1", multipcm_r, multipcm_w, 0x00ff ) AM_RANGE(0xc40012, 0xc40013) AM_WRITENOP - AM_RANGE(0xc50000, 0xc50001) AM_DEVWRITE( SOUND, "sega1", m1_snd_mpcm_bnk_w ) - AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8( SOUND, "sega2", multipcm_r, multipcm_w, 0x00ff ) - AM_RANGE(0xc70000, 0xc70001) AM_DEVWRITE( SOUND, "sega2", m1_snd_mpcm_bnk_w ) - AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( SOUND, "ym", ym3438_r, ym3438_w, 0x00ff ) + AM_RANGE(0xc50000, 0xc50001) AM_DEVWRITE( "sega1", m1_snd_mpcm_bnk_w ) + AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8( "sega2", multipcm_r, multipcm_w, 0x00ff ) + AM_RANGE(0xc70000, 0xc70001) AM_DEVWRITE( "sega2", m1_snd_mpcm_bnk_w ) + AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8( "ym", ym3438_r, ym3438_w, 0x00ff ) AM_RANGE(0xf00000, 0xf0ffff) AM_RAM ADDRESS_MAP_END @@ -1632,7 +1632,7 @@ static WRITE16_HANDLER( model2snd_ctrl ) static ADDRESS_MAP_START( model2_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_REGION("audiocpu", 0) AM_BASE(&model2_soundram) - AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE(SOUND, "scsp", scsp_r, scsp_w) + AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp", scsp_r, scsp_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(model2snd_ctrl) AM_RANGE(0x600000, 0x67ffff) AM_ROM AM_REGION("audiocpu", 0x80000) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("scsp", 0) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 8ad0c7ded56..5d417015a3d 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1346,7 +1346,7 @@ static WRITE64_HANDLER(model3_sound_w) // serial configuration writes if ((mem_mask == U64(0xff00000000000000)) && (offset == 0)) { - scsp_midi_in(devtag_get_device(space->machine, SOUND, "scsp1"), 0, (data>>56)&0xff, 0); + scsp_midi_in(devtag_get_device(space->machine, "scsp1"), 0, (data>>56)&0xff, 0); // give the 68k time to notice cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(40)); @@ -4253,9 +4253,9 @@ static WRITE16_HANDLER( model3snd_ctrl ) static ADDRESS_MAP_START( model3_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_REGION("scsp1", 0) AM_BASE(&model3_soundram) - AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE(SOUND, "scsp1", scsp_r, scsp_w) + AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp1", scsp_r, scsp_w) AM_RANGE(0x200000, 0x27ffff) AM_RAM AM_REGION("scsp2", 0) - AM_RANGE(0x300000, 0x300fff) AM_DEVREADWRITE(SOUND, "scsp2", scsp_r, scsp_w) + AM_RANGE(0x300000, 0x300fff) AM_DEVREADWRITE("scsp2", scsp_r, scsp_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(model3snd_ctrl) AM_RANGE(0x600000, 0x67ffff) AM_ROM AM_REGION("audiocpu", 0x80000) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("samples", 0) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 7225f742fc4..bb1060f04a5 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -90,8 +90,8 @@ static WRITE8_HANDLER( mogura_tileram_w ) static WRITE8_HANDLER(mogura_dac_w) { - dac_data_w(devtag_get_device(space->machine, SOUND, "dac1"), data & 0xf0 ); /* left */ - dac_data_w(devtag_get_device(space->machine, SOUND, "dac2"), (data & 0x0f)<<4 ); /* right */ + dac_data_w(devtag_get_device(space->machine, "dac1"), data & 0xf0 ); /* left */ + dac_data_w(devtag_get_device(space->machine, "dac2"), (data & 0x0f)<<4 ); /* right */ } static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 5ef7affa656..2e4ea15cec2 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -111,7 +111,7 @@ static ADDRESS_MAP_START( mole_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x7fff) AM_MIRROR(0x8000) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(mole_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8400, 0x8400) AM_WRITE(mole_tilebank_w) - AM_RANGE(0x8c00, 0x8c01) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x8c00, 0x8c01) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x8c40, 0x8c40) AM_WRITENOP // ??? AM_RANGE(0x8c80, 0x8c80) AM_WRITENOP // ??? AM_RANGE(0x8c81, 0x8c81) AM_WRITENOP // ??? diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index 2a0e35aa167..b79308cf2a4 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -119,17 +119,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym2", ym2203_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xa001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym1", ym2203_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) /* unknown */ - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END /****************************************************************************/ diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 8dbbe76afc4..1874d2f1c41 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -358,7 +358,7 @@ static ADDRESS_MAP_START( readmembl, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x0d6ffe, 0x0d6fff) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r) AM_RANGE(0x0da002, 0x0da003) AM_READ(player2_r) AM_RANGE(0x0dc000, 0x0dc001) AM_READ_PORT("IN0") @@ -380,8 +380,8 @@ static ADDRESS_MAP_START( writemembl, ADDRESS_SPACE_PROGRAM, 16 ) 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(SMH_RAM) /* CCU regs (ignored) */ - AM_RANGE(0x0d6ffc, 0x0d6ffd) AM_DEVWRITE(SOUND, "oki", moobl_oki_bank_w) - AM_RANGE(0x0d6ffe, 0x0d6fff) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x0d6ffc, 0x0d6ffd) AM_DEVWRITE("oki", moobl_oki_bank_w) + AM_RANGE(0x0d6ffe, 0x0d6fff) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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(SMH_ROM) @@ -451,8 +451,8 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami", k054539_r) - AM_RANGE(0xec00, 0xec01) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xe000, 0xe22f) AM_DEVREAD("konami", k054539_r) + AM_RANGE(0xec00, 0xec01) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) ADDRESS_MAP_END @@ -460,8 +460,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe22f) AM_DEVWRITE(SOUND, "konami", k054539_w) - AM_RANGE(0xec00, 0xec01) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xe000, 0xe22f) AM_DEVWRITE("konami", k054539_w) + AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index 229638e9382..cf2bde51403 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -131,7 +131,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_WRITE(SMH_NOP) /* Z180 internal registers */ AM_RANGE(0x30, 0x30) AM_READ(SMH_NOP) /* Z180 internal registers */ - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x72, 0x72) AM_READWRITE(protection_r, protection_w) AM_RANGE(0x74, 0x74) AM_READ_PORT("P1") AM_RANGE(0x76, 0x76) AM_READ_PORT("P2") @@ -141,7 +141,7 @@ static ADDRESS_MAP_START( gfire2_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_WRITE(SMH_NOP) /* Z180 internal registers */ AM_RANGE(0x30, 0x30) AM_READ(SMH_NOP) /* Z180 internal registers */ - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x72, 0x72) AM_READWRITE(gfire2_protection_r, gfire2_protection_w) AM_RANGE(0x74, 0x74) AM_READ_PORT("P1") AM_RANGE(0x76, 0x76) AM_READ_PORT("P2") diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 4bdcdc0ffa6..cd9ea268fe5 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -95,8 +95,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map_2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay2", ay8910_data_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( mouser ) diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 43e6b46429f..0413fa81a45 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -772,14 +772,14 @@ static void update_ay(const address_space *space) } case 0x02: {/* CA2 = 0 CB2 = 1? : Write to selected PSG register and write data to Port A */ - ay8910_data_w(devtag_get_device(space->machine, SOUND, "ay8913"), 0, pia_get_output_a(3)); + ay8910_data_w(devtag_get_device(space->machine, "ay8913"), 0, pia_get_output_a(3)); LOG(("AY Chip Write \n")); break; } case 0x03: {/* CA2 = 1 CB2 = 1? : The register will now be selected and the user can read from or write to it. The register will remain selected until another is chosen.*/ - ay8910_address_w(devtag_get_device(space->machine, SOUND, "ay8913"), 0, pia_get_output_a(3)); + ay8910_address_w(devtag_get_device(space->machine, "ay8913"), 0, pia_get_output_a(3)); LOG(("AY Chip Select \n")); break; } @@ -1004,7 +1004,7 @@ static const pia6821_interface pia_ic8_intf = static WRITE8_HANDLER( pia_gb_porta_w ) { - const device_config *msm6376 = devtag_get_device(space->machine, SOUND, "msm6376"); + const device_config *msm6376 = devtag_get_device(space->machine, "msm6376"); LOG(("%04x GAMEBOARD: PIA Port A Set to %2x\n", cpu_get_previouspc(space->cpu),data)); okim6376_w(msm6376, 0, data); @@ -1692,7 +1692,7 @@ static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0850, 0x0850) AM_WRITE(bankswitch_w) // write bank (rom page select) - AM_RANGE(0x0880, 0x0881) AM_DEVWRITE( SOUND, "ym2413", ym2413_w ) + AM_RANGE(0x0880, 0x0881) AM_DEVWRITE( "ym2413", ym2413_w ) // AM_RANGE(0x08E0, 0x08E7) AM_READWRITE(68681_duart_r,68681_duart_w) diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index cf864e22674..5f97936fb51 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -378,8 +378,8 @@ static WRITE8_HANDLER( vid_o1_callback ) if (data) { - const device_config *acia_0 = device_list_find_by_tag(space->machine->config->devicelist, ACIA6850, "acia6850_0"); - const device_config *acia_1 = device_list_find_by_tag(space->machine->config->devicelist, ACIA6850, "acia6850_1"); + const device_config *acia_0 = devtag_get_device(space->machine, "acia6850_0"); + const device_config *acia_1 = devtag_get_device(space->machine, "acia6850_1"); acia6850_tx_clock_in(acia_0); acia6850_rx_clock_in(acia_0); acia6850_tx_clock_in(acia_1); @@ -1453,8 +1453,8 @@ static ADDRESS_MAP_START( mpu4_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE(&mpu4_vid_mainram) /* mainram / char address ram? */ /* what is here, the sound chip? Assume so */ - AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8(SOUND, "saa", saa1099_control_w, 0x00ff) - AM_RANGE(0x900002, 0x900003) AM_DEVWRITE8(SOUND, "saa", saa1099_data_w, 0x00ff) + AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8("saa", saa1099_control_w, 0x00ff) + AM_RANGE(0x900002, 0x900003) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff) AM_RANGE(0xa00000, 0xa00003) AM_READWRITE(ef9369_r, ef9369_w) /* the palette chip */ /* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ @@ -1464,8 +1464,8 @@ static ADDRESS_MAP_START( mpu4_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000, 0xc1ffff) AM_READWRITE(mpu4_vid_vidram_r, mpu4_vid_vidram_w) /* comms with the MPU4 */ - AM_RANGE(0xff8000, 0xff8001) AM_DEVREADWRITE8(ACIA6850, "acia6850_1", acia6850_stat_r, acia6850_ctrl_w, 0xff) - AM_RANGE(0xff8002, 0xff8003) AM_DEVREADWRITE8(ACIA6850, "acia6850_1", acia6850_data_r, acia6850_data_w, 0xff) + AM_RANGE(0xff8000, 0xff8001) AM_DEVREADWRITE8("acia6850_1", acia6850_stat_r, acia6850_ctrl_w, 0xff) + AM_RANGE(0xff8002, 0xff8003) AM_DEVREADWRITE8("acia6850_1", acia6850_data_r, acia6850_data_w, 0xff) AM_RANGE(0xff9000, 0xff900f) AM_READWRITE(ptm6840_1_lsb_r,ptm6840_1_lsb_w) /* 6840PTM */ @@ -1476,8 +1476,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mpu4_6809_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07FF) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE(ACIA6850, "acia6850_0", acia6850_stat_r, acia6850_ctrl_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(ACIA6850, "acia6850_0", acia6850_data_r, acia6850_data_w) + AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("acia6850_0", acia6850_stat_r, acia6850_ctrl_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("acia6850_0", acia6850_data_r, acia6850_data_w) AM_RANGE(0x0880, 0x0881) AM_NOP /* Could be a UART datalogger is here. */ @@ -1506,8 +1506,8 @@ static ADDRESS_MAP_START( vp_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */ /* what is here, the sound chip? Assume so */ - AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8(SOUND, "saa", saa1099_control_w, 0x00ff) - AM_RANGE(0x900002, 0x900003) AM_DEVWRITE8(SOUND, "saa", saa1099_data_w, 0x00ff) + AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8("saa", saa1099_control_w, 0x00ff) + AM_RANGE(0x900002, 0x900003) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff) /* the palette chip */ AM_RANGE(0xa00000, 0xa00003) AM_READWRITE(ef9369_r, ef9369_w) /* the palette chip */ @@ -1520,8 +1520,8 @@ static ADDRESS_MAP_START( vp_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) /* AM_RANGE(0xe05000, 0xe05001) AM_READWRITE(adpcm_r, adpcm_w) */ /* comms with the MPU4 */ - AM_RANGE(0xff8000, 0xff8001) AM_DEVREADWRITE8(ACIA6850, "acia6850_1", acia6850_stat_r, acia6850_ctrl_w, 0xff) - AM_RANGE(0xff8002, 0xff8003) AM_DEVREADWRITE8(ACIA6850, "acia6850_1", acia6850_data_r, acia6850_data_w, 0xff) + AM_RANGE(0xff8000, 0xff8001) AM_DEVREADWRITE8("acia6850_1", acia6850_stat_r, acia6850_ctrl_w, 0xff) + AM_RANGE(0xff8002, 0xff8003) AM_DEVREADWRITE8("acia6850_1", acia6850_data_r, acia6850_data_w, 0xff) AM_RANGE(0xff9000, 0xff900f) AM_READ( ptm6840_1_lsb_r) AM_RANGE(0xff9000, 0xff900f) AM_WRITE( ptm6840_1_lsb_w) @@ -1660,8 +1660,8 @@ static const mc6845_interface hd6845_intf = static ADDRESS_MAP_START( dealem_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(HD6845, "crtc", mc6845_address_w) - AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(HD6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) /* AM_RANGE(0x08E0, 0x08E7) AM_READWRITE(68681_duart_r,68681_duart_w) */ diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index a0da3d376ce..4d0930e5b2f 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -146,7 +146,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfc0000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* System ROM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x204000, 0x2041ff) AM_DEVREADWRITE8(SOUND, "ensoniq", es5503_r, mquake_es5503_w, 0x00ff) + AM_RANGE(0x204000, 0x2041ff) AM_DEVREADWRITE8("ensoniq", es5503_r, mquake_es5503_w, 0x00ff) AM_RANGE(0x282000, 0x282001) AM_READ_PORT("SW.LO") AM_RANGE(0x282002, 0x282003) AM_READ_PORT("SW.HI") AM_RANGE(0x284000, 0x28400f) AM_WRITE(output_w) @@ -319,7 +319,7 @@ static const es5503_interface es5503_intf = static MACHINE_RESET(mquake) { /* set ES5503 wave memory (this is banked in 64k increments) */ - es5503_set_base(devtag_get_device(machine, SOUND, "ensoniq"), memory_region(machine, "ensoniq")); + es5503_set_base(devtag_get_device(machine, "ensoniq"), memory_region(machine, "ensoniq")); MACHINE_RESET_CALL(amiga); } diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index 9515fa39557..9538070e60a 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -48,8 +48,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(mrdo_fgvideoram_w) AM_BASE(&mrdo_fgvideoram) 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_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x9802, 0x9802) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x9801, 0x9801) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x9802, 0x9802) AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0x9803, 0x9803) AM_READ(mrdo_SECRE_r) AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_RANGE(0xa001, 0xa001) AM_READ_PORT("P2") diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 9d42f0fc953..e31b427e578 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -200,14 +200,14 @@ static ADDRESS_MAP_START( inout_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_WRITE(mrflea_main_w) AM_RANGE(0x22, 0x22) AM_READ(mrflea_io_status_r) AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP) /* 0xb4,0x09,0x05 */ - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay1", ay8910_data_address_w) AM_RANGE(0x42, 0x42) AM_READWRITE(mrflea_input1_r, mrflea_data1_w) AM_RANGE(0x43, 0x43) AM_WRITE(mrflea_select1_w) - AM_RANGE(0x44, 0x44) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x44, 0x45) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x46, 0x46) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0x46, 0x47) AM_DEVWRITE(SOUND, "ay3", ay8910_data_address_w) + AM_RANGE(0x44, 0x44) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x44, 0x45) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x46, 0x46) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0x46, 0x47) AM_DEVWRITE("ay3", ay8910_data_address_w) ADDRESS_MAP_END /*******************************************************/ diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c index ac483b7f307..e9c3cbeeb8d 100644 --- a/src/mame/drivers/mrjong.c +++ b/src/mame/drivers/mrjong.c @@ -88,8 +88,8 @@ static READ8_HANDLER( io_0x03_r ) static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("P2") AM_WRITE(io_0x00_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW") AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW") AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0x03, 0x03) AM_READ(io_0x03_r) // Unknown ADDRESS_MAP_END diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 4fda9297c6b..ec4f3106a59 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -1174,7 +1174,7 @@ static WRITE8_HANDLER( to_main_w ) static ADDRESS_MAP_START( ms32_snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3eff) AM_READ(SMH_ROM) - AM_RANGE(0x3f00, 0x3f0f) AM_DEVREAD(SOUND, "ymf", ymf271_r) + AM_RANGE(0x3f00, 0x3f0f) AM_DEVREAD("ymf", ymf271_r) AM_RANGE(0x3f10, 0x3f10) AM_READ(latch_r) AM_RANGE(0x3f20, 0x3f20) AM_READ(SMH_NOP) /* 2nd latch ? */ AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_RAM) @@ -1184,7 +1184,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ms32_snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3eff) AM_WRITE(SMH_ROM) - AM_RANGE(0x3f00, 0x3f0f) AM_DEVWRITE(SOUND, "ymf", ymf271_w) + AM_RANGE(0x3f00, 0x3f0f) AM_DEVWRITE("ymf", ymf271_w) AM_RANGE(0x3f10, 0x3f10) AM_WRITE(to_main_w) 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) */ diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 0ea7a77d840..d4c344ec435 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -315,10 +315,10 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8002, 0x8003) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8010, 0x801d) AM_DEVWRITE(SOUND, "msm", msm5232_w) - AM_RANGE(0x8020, 0x8020) AM_DEVWRITE(SOUND, "msm", sound_control_0_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8002, 0x8003) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8010, 0x801d) AM_DEVWRITE("msm", msm5232_w) + AM_RANGE(0x8020, 0x8020) AM_DEVWRITE("msm", sound_control_0_w) AM_RANGE(0x8030, 0x8030) AM_WRITE(sound_control_1_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(nmi_enable_w) diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 65a391fb11d..6072fa5cdac 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -214,16 +214,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x8800, 0x8801) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index edf79b0c949..f4f7c968d6d 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -364,9 +364,9 @@ static ADDRESS_MAP_START( multfish_portmap, ADDRESS_SPACE_IO, 8 ) // AM_RANGE(0x35, 0x35) AM_WRITE(multfish_port35_w) // AM_RANGE(0x36, 0x36) AM_WRITE(multfish_port36_w) // AM_RANGE(0x37, 0x37) AM_WRITE(multfish_watchdog_reset_w) - AM_RANGE(0x38, 0x38) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x39, 0x39) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) - AM_RANGE(0x3a, 0x3a) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x38, 0x38) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x39, 0x39) AM_DEVWRITE("ay", ay8910_data_w) + AM_RANGE(0x3a, 0x3a) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0x90, 0x90) AM_READ(ray_r) diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 6f8787060fe..956896abd40 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -179,11 +179,11 @@ static ADDRESS_MAP_START( multigam_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */ AM_RANGE(0x0800, 0x0fff) AM_RAM /* additional RAM */ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE(SOUND, "nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w) - AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE(SOUND, "nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE("nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ AM_RANGE(0x4016, 0x4016) AM_READWRITE(multigam_IN0_r, multigam_IN0_w) /* IN0 - input port 1 */ - AM_RANGE(0x4017, 0x4017) AM_READ(multigam_IN1_r) AM_DEVWRITE(SOUND, "nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4017, 0x4017) AM_READ(multigam_IN1_r) AM_DEVWRITE("nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x5002, 0x5002) AM_WRITENOP AM_RANGE(0x5000, 0x5ffe) AM_ROM AM_RANGE(0x5fff, 0x5fff) AM_READ_PORT("IN0") @@ -427,11 +427,11 @@ static ADDRESS_MAP_START( multigm3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */ AM_RANGE(0x0800, 0x0fff) AM_RAM /* additional RAM */ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE(SOUND, "nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes", nes_psg_r, nes_psg_w) /* PSG primary registers */ AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w) - AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE(SOUND, "nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE("nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ AM_RANGE(0x4016, 0x4016) AM_READWRITE(multigam_IN0_r, multigam_IN0_w) /* IN0 - input port 1 */ - AM_RANGE(0x4017, 0x4017) AM_READ(multigam_IN1_r) AM_DEVWRITE(SOUND, "nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4017, 0x4017) AM_READ(multigam_IN1_r) AM_DEVWRITE("nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x5001, 0x5001) AM_WRITE(multigm3_switch_prg_rom) AM_RANGE(0x5002, 0x5002) AM_WRITENOP AM_RANGE(0x5003, 0x5003) AM_WRITE(multigam_switch_gfx_rom) diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 4a416b1cf02..aeccb979e7a 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -118,10 +118,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x2000) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x5000, 0x5000) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x7000, 0x7000) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x5000, 0x5000) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x7000, 0x7000) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0x8000, 0x8000) AM_WRITENOP /* ? */ AM_RANGE(0xa000, 0xa000) AM_WRITENOP /* ? */ AM_RANGE(0xc000, 0xc000) AM_WRITE(sound_nmi_ack_w) diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index b94b9e02175..44b710f9fc1 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -103,8 +103,8 @@ static UINT8 *murogem_videoram; static ADDRESS_MAP_START( murogem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x4001, 0x4001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x4001, 0x4001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_RANGE(0x5800, 0x5800) AM_READ_PORT("IN1") AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) // sound? payout? diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c index 65d4c5a9e08..e1925039dda 100644 --- a/src/mame/drivers/mw8080bw.c +++ b/src/mame/drivers/mw8080bw.c @@ -612,7 +612,7 @@ static CUSTOM_INPUT( tornbase_score_input_r ) static WRITE8_HANDLER( tornbase_io_w ) { - if (offset & 0x01) tornbase_audio_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); + if (offset & 0x01) tornbase_audio_w(devtag_get_device(space->machine, "discrete"), 0, data); if (offset & 0x02) mb14241_0_shift_count_w(space, 0, data); @@ -860,14 +860,14 @@ static UINT8 maze_tone_timing_state; static STATE_POSTLOAD( maze_update_discrete ) { - maze_write_discrete(devtag_get_device(machine, SOUND, "discrete"), maze_tone_timing_state); + maze_write_discrete(devtag_get_device(machine, "discrete"), maze_tone_timing_state); } static TIMER_CALLBACK( maze_tone_timing_timer_callback ) { maze_tone_timing_state = !maze_tone_timing_state; - maze_write_discrete(devtag_get_device(machine, SOUND, "discrete"), maze_tone_timing_state); + maze_write_discrete(devtag_get_device(machine, "discrete"), maze_tone_timing_state); } @@ -981,10 +981,10 @@ static ADDRESS_MAP_START( boothill_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mw8080bw_reversable_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", boothill_audio_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", boothill_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("discrete", midway_tone_generator_hi_w) ADDRESS_MAP_END @@ -1056,7 +1056,7 @@ MACHINE_DRIVER_END static WRITE8_HANDLER( checkmat_io_w ) { - if (offset & 0x01) checkmat_audio_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); + if (offset & 0x01) checkmat_audio_w(devtag_get_device(space->machine, "discrete"), 0, data); if (offset & 0x02) watchdog_reset_w(space, 0, data); } @@ -1213,11 +1213,11 @@ static ADDRESS_MAP_START( desertgu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", desertgu_audio_1_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", desertgu_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", desertgu_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("discrete", midway_tone_generator_hi_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE("discrete", desertgu_audio_2_w) ADDRESS_MAP_END @@ -1333,10 +1333,10 @@ static ADDRESS_MAP_START( dplay_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", dplay_audio_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", dplay_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("discrete", midway_tone_generator_hi_w) ADDRESS_MAP_END @@ -1721,9 +1721,9 @@ static ADDRESS_MAP_START( clowns_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x03, 0x03) AM_WRITE(clowns_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", clowns_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("discrete", midway_tone_generator_hi_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE("discrete", clowns_audio_2_w) ADDRESS_MAP_END @@ -1934,8 +1934,8 @@ static ADDRESS_MAP_START( dogpatch_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x03, 0x03) AM_WRITE(dogpatch_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_lo_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "discrete", midway_tone_generator_hi_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", midway_tone_generator_lo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("discrete", midway_tone_generator_hi_w) ADDRESS_MAP_END @@ -2066,13 +2066,13 @@ static WRITE8_HANDLER( spcenctr_io_w ) watchdog_reset_w(space, 0, data); /* - - - - - 0 1 0 */ else if ((offset & 0x5f) == 0x01) - spcenctr_audio_1_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); /* - 0 - 0 0 0 0 1 */ + spcenctr_audio_1_w(devtag_get_device(space->machine, "discrete"), 0, data); /* - 0 - 0 0 0 0 1 */ else if ((offset & 0x5f) == 0x09) - spcenctr_audio_2_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); /* - 0 - 0 1 0 0 1 */ + spcenctr_audio_2_w(devtag_get_device(space->machine, "discrete"), 0, data); /* - 0 - 0 1 0 0 1 */ else if ((offset & 0x5f) == 0x11) - spcenctr_audio_3_w(devtag_get_device(space->machine, SOUND, "discrete"), 0, data); /* - 0 - 1 0 0 0 1 */ + spcenctr_audio_3_w(devtag_get_device(space->machine, "discrete"), 0, data); /* - 0 - 1 0 0 0 1 */ else if ((offset & 0x07) == 0x03) { /* - - - - - 0 1 1 */ @@ -2344,7 +2344,7 @@ static ADDRESS_MAP_START( bowler_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", bowler_audio_1_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", bowler_audio_1_w) AM_RANGE(0x06, 0x06) AM_WRITE(bowler_audio_2_w) AM_RANGE(0x07, 0x07) AM_WRITE(bowler_lights_1_w) AM_RANGE(0x08, 0x08) AM_WRITE(bowler_audio_3_w) @@ -2540,9 +2540,9 @@ static ADDRESS_MAP_START( invaders_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_MIRROR(0x04) AM_READ(mb14241_0_shift_result_r) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_count_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", invaders_audio_1_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", invaders_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", invaders_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", invaders_audio_2_w) AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -2669,7 +2669,7 @@ static ADDRESS_MAP_START( blueshrk_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(mb14241_0_shift_count_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", blueshrk_audio_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", blueshrk_audio_w) AM_RANGE(0x04, 0x04) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -2745,13 +2745,13 @@ static ADDRESS_MAP_START( invad2ct_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_MIRROR(0x04) AM_READ_PORT("IN2") AM_RANGE(0x03, 0x03) AM_MIRROR(0x04) AM_READ(mb14241_0_shift_result_r) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_3_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("discrete", invad2ct_audio_3_w) AM_RANGE(0x02, 0x02) AM_WRITE(mb14241_0_shift_count_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_1_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("discrete", invad2ct_audio_1_w) AM_RANGE(0x04, 0x04) AM_WRITE(mb14241_0_shift_data_w) - AM_RANGE(0x05, 0x05) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_2_w) + AM_RANGE(0x05, 0x05) AM_DEVWRITE("discrete", invad2ct_audio_2_w) AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x07, 0x07) AM_DEVWRITE(SOUND, "discrete", invad2ct_audio_4_w) + AM_RANGE(0x07, 0x07) AM_DEVWRITE("discrete", invad2ct_audio_4_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 25b62758d90..5dac8b0cb39 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -144,12 +144,12 @@ static ADDRESS_MAP_START( mwarr_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x110000, 0x110001) AM_READ_PORT("P1_P2") AM_RANGE(0x110002, 0x110003) AM_READ_PORT("SYSTEM") AM_RANGE(0x110004, 0x110005) AM_READ_PORT("DSW") - AM_RANGE(0x110010, 0x110011) AM_DEVWRITE(SOUND, "oki2", oki1_bank_w) + AM_RANGE(0x110010, 0x110011) AM_DEVWRITE("oki2", oki1_bank_w) AM_RANGE(0x110014, 0x110015) AM_WRITE(mwarr_brightness_w) AM_RANGE(0x110016, 0x110017) AM_WRITE(sprites_commands_w) AM_RANGE(0x110000, 0x11ffff) AM_RAM AM_BASE(&mwarr_ram) - AM_RANGE(0x180000, 0x180001) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x190000, 0x190001) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x180000, 0x180001) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x190000, 0x190001) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) ADDRESS_MAP_END static INPUT_PORTS_START( mwarr ) diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index 308ed7155eb..11ccf88cc8b 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -78,14 +78,14 @@ static WRITE8_HANDLER( mystston_ay8910_select_w ) if (((*state->ay8910_select & 0x20) == 0x20) && ((data & 0x20) == 0x00)) { /* bit 4 goes to the 8910 #0 BC1 pin */ - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay1"), *state->ay8910_select >> 4, *state->ay8910_data); + ay8910_data_address_w(devtag_get_device(space->machine, "ay1"), *state->ay8910_select >> 4, *state->ay8910_data); } /* bit 7 goes to 8910 #1 BDIR pin */ if (((*state->ay8910_select & 0x80) == 0x80) && ((data & 0x80) == 0x00)) { /* bit 6 goes to the 8910 #1 BC1 pin */ - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay2"), *state->ay8910_select >> 6, *state->ay8910_data); + ay8910_data_address_w(devtag_get_device(space->machine, "ay2"), *state->ay8910_select >> 6, *state->ay8910_data); } *state->ay8910_select = data; diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index e9c5c04dba4..ec030037d67 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -793,9 +793,9 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami1", k054539_r) + AM_RANGE(0xe000, 0xe22f) AM_DEVREAD("konami1", k054539_r) AM_RANGE(0xe230, 0xe3ff) AM_READ(SMH_RAM) - AM_RANGE(0xe400, 0xe62f) AM_DEVREAD(SOUND, "konami2", k054539_r) + AM_RANGE(0xe400, 0xe62f) AM_DEVREAD("konami2", k054539_r) AM_RANGE(0xe630, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) @@ -804,9 +804,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_NOP) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe22f) AM_DEVWRITE(SOUND, "konami1", k054539_w) + AM_RANGE(0xe000, 0xe22f) AM_DEVWRITE("konami1", k054539_w) AM_RANGE(0xe230, 0xe3ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe400, 0xe62f) AM_DEVWRITE(SOUND, "konami2", k054539_w) + AM_RANGE(0xe400, 0xe62f) AM_DEVWRITE("konami2", k054539_w) 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) @@ -870,8 +870,8 @@ static MACHINE_START( mystwarr ) static MACHINE_RESET(mystwarr) { - const device_config *k054539_1 = devtag_get_device(machine, SOUND, "konami1"); - const device_config *k054539_2 = devtag_get_device(machine, SOUND, "konami2"); + const device_config *k054539_1 = devtag_get_device(machine, "konami1"); + const device_config *k054539_2 = devtag_get_device(machine, "konami2"); int i; // soften chorus(chip 0 channel 0-3), boost voice(chip 0 channel 4-7) @@ -887,7 +887,7 @@ static MACHINE_RESET(mystwarr) static MACHINE_RESET(dadandrn) { - const device_config *k054539_1 = devtag_get_device(machine, SOUND, "konami1"); + const device_config *k054539_1 = devtag_get_device(machine, "konami1"); int i; // boost voice(chip 0 channel 4-7) @@ -896,7 +896,7 @@ static MACHINE_RESET(dadandrn) static MACHINE_RESET(viostorm) { - const device_config *k054539_1 = devtag_get_device(machine, SOUND, "konami1"); + const device_config *k054539_1 = devtag_get_device(machine, "konami1"); int i; // boost voice(chip 0 channel 4-7) @@ -905,8 +905,8 @@ static MACHINE_RESET(viostorm) static MACHINE_RESET(metamrph) { - const device_config *k054539_1 = devtag_get_device(machine, SOUND, "konami1"); - const device_config *k054539_2 = devtag_get_device(machine, SOUND, "konami2"); + const device_config *k054539_1 = devtag_get_device(machine, "konami1"); + const device_config *k054539_2 = devtag_get_device(machine, "konami2"); int i; // boost voice(chip 0 channel 4-7) and soften other channels @@ -921,7 +921,7 @@ static MACHINE_RESET(metamrph) static MACHINE_RESET(martchmp) { - const device_config *k054539_1 = devtag_get_device(machine, SOUND, "konami1"); + const device_config *k054539_1 = devtag_get_device(machine, "konami1"); int i; k054539_init_flags(k054539_1, K054539_REVERSE_STEREO); @@ -932,7 +932,7 @@ static MACHINE_RESET(martchmp) static MACHINE_RESET(gaiapols) { - const device_config *k054539_1 = devtag_get_device(machine, SOUND, "konami1"); + const device_config *k054539_1 = devtag_get_device(machine, "konami1"); int i; // boost voice(chip 0 channel 5-7) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 41503cf9e35..ce3b4252ecb 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -828,7 +828,7 @@ static WRITE16_DEVICE_HANDLER(snd_w) static ADDRESS_MAP_START( namcona1_mcu_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000800, 0x000fff) AM_READWRITE(mcu_mailbox_r, mcu_mailbox_w_mcu) // "Mailslot" communications ports - AM_RANGE(0x001000, 0x001fff) AM_DEVREADWRITE(SOUND, "c140", snd_r, snd_w) // C140-alike sound chip + AM_RANGE(0x001000, 0x001fff) AM_DEVREADWRITE("c140", snd_r, snd_w) // C140-alike sound chip AM_RANGE(0x002000, 0x002fff) AM_READWRITE(na1mcu_shared_r, na1mcu_shared_w) // mirror of first page of shared work RAM AM_RANGE(0x003000, 0x00afff) AM_RAM // there is a 32k RAM chip according to CGFM AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("mcu", 0) // internal ROM BIOS @@ -919,7 +919,7 @@ static WRITE8_HANDLER( port8_w ) static MACHINE_START( namcona1 ) { - c140_set_base(devtag_get_device(machine, SOUND, "c140"), namcona1_workram); + c140_set_base(devtag_get_device(machine, "c140"), namcona1_workram); } // for games with the MCU emulated, the MCU boots the 68000. don't allow it before that. diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 9b38a4ce48d..b550cdde826 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -912,7 +912,7 @@ static WRITE16_HANDLER( nbmcu_shared_w ) } static ADDRESS_MAP_START( namcoc75_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE(SOUND, "c352", c352_r, c352_w) + AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w) AM_RANGE(0x004000, 0x00bfff) AM_RAM_WRITE(nbmcu_shared_w) AM_BASE(&namconb_shareram) AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c75", 0) AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION("c75data", 0) diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index 3983c3c98ba..ed2be3c9cdf 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( namcond1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(namcond1_shared_ram_r,namcond1_shared_ram_w) AM_BASE(&namcond1_shared_ram) AM_RANGE(0x800000, 0x80000f) AM_READWRITE(ygv608_r,ygv608_w) - AM_RANGE(0xa00000, 0xa00fff) AM_DEVREADWRITE8(AT28C16, "at28c16", at28c16_r, at28c16_w, 0xff00) + AM_RANGE(0xa00000, 0xa00fff) AM_DEVREADWRITE8("at28c16", at28c16_r, at28c16_w, 0xff00) #ifdef MAME_DEBUG AM_RANGE(0xb00000, 0xb00001) AM_READ(ygv608_debug_trigger) #endif @@ -251,7 +251,7 @@ static WRITE8_HANDLER( mcu_pa_write ) static ADDRESS_MAP_START( nd1h8rwmap, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREADWRITE( SOUND, "c352", c352_r, c352_w ) + AM_RANGE(0xa00000, 0xa07fff) AM_DEVREADWRITE( "c352", c352_r, c352_w ) AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("DSW") AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1_P2") AM_RANGE(0xc00010, 0xc00011) AM_NOP diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 1c7fc528267..9a72f512b3c 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -384,7 +384,7 @@ static WRITE8_HANDLER( namcos1_coin_w ) static void namcos1_update_DACs(running_machine *machine) { - dac_signed_data_16_w(devtag_get_device(machine, SOUND, "dac"),0x8000 + (dac0_value * dac0_gain) + (dac1_value * dac1_gain)); + dac_signed_data_16_w(devtag_get_device(machine, "dac"),0x8000 + (dac0_value * dac0_gain) + (dac1_value * dac1_gain)); } void namcos1_init_DACs(void) @@ -464,9 +464,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(17) /* Banked ROMs */ - AM_RANGE(0x4000, 0x4001) AM_DEVREAD(SOUND, "ym", ym2151_status_port_r) - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x5000, 0x53ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r, namcos1_cus30_w) AM_MIRROR(0x400) AM_BASE(&namco_wavedata) /* PSG ( Shared ) */ + AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ym", ym2151_status_port_r) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x5000, 0x53ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) AM_MIRROR(0x400) AM_BASE(&namco_wavedata) /* PSG ( Shared ) */ AM_RANGE(0x7000, 0x77ff) AM_RAMBANK(18) /* TRIRAM (shared) */ AM_RANGE(0x8000, 0x9fff) AM_RAM /* Sound RAM 3 */ AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos1_sound_bankswitch_w) /* ROM bank selector */ diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index ee8af50f6d9..e69d17c9d1e 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -750,7 +750,7 @@ static ADDRESS_MAP_START( namcos11_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f802040, 0x1f802043) AM_WRITENOP AM_RANGE(0x1fa04000, 0x1fa0ffff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(&namcos11_sharedram) /* shared ram */ AM_RANGE(0x1fa20000, 0x1fa2ffff) AM_WRITE(keycus_w) AM_BASE(&namcos11_keycus) AM_SIZE(&namcos11_keycus_size) /* keycus */ - AM_RANGE(0x1fa30000, 0x1fa30fff) AM_DEVREADWRITE8(AT28C16, "at28c16", at28c16_r, at28c16_w, 0x00ff00ff) /* eeprom */ + AM_RANGE(0x1fa30000, 0x1fa30fff) AM_DEVREADWRITE8("at28c16", at28c16_r, at28c16_w, 0x00ff00ff) /* eeprom */ AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITENOP /* ?? */ AM_RANGE(0x1fbf6000, 0x1fbf6003) AM_WRITENOP /* ?? */ AM_RANGE(0x1fc00000, 0x1fffffff) AM_ROM AM_SHARE(2) AM_REGION("user1", 0) /* bios */ diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 55448387d03..80ef49501b4 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1088,7 +1088,7 @@ 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(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_DEVREADWRITE8(AT28C16, "at28c16", at28c16_r, at28c16_w, 0x00ff00ff) /* eeprom */ + AM_RANGE(0x1f140000, 0x1f140fff) AM_DEVREADWRITE8("at28c16", at28c16_r, at28c16_w, 0x00ff00ff) /* eeprom */ AM_RANGE(0x1f1bff08, 0x1f1bff0f) AM_WRITENOP /* ?? */ AM_RANGE(0x1f700000, 0x1f70ffff) AM_WRITE(dmaoffset_w) /* dma */ AM_RANGE(0x1f800000, 0x1f8003ff) AM_RAM /* scratchpad */ @@ -1250,7 +1250,7 @@ static MACHINE_RESET( namcos12 ) static ADDRESS_MAP_START( s12h8rwmap, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREADWRITE( SOUND, "c352", c352_r, c352_w ) + AM_RANGE(0x280000, 0x287fff) AM_DEVREADWRITE( "c352", c352_r, c352_w ) AM_RANGE(0x300000, 0x300001) AM_READ_PORT("IN0") AM_RANGE(0x300002, 0x300003) AM_READ_PORT("IN1") AM_RANGE(0x300010, 0x300011) AM_NOP // golgo13 writes here a lot, possibly also a wait state generator? diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 3c173700830..42603fbd1c0 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -712,8 +712,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(BANKED_SOUND_ROM_R) /* banked */ - AM_RANGE(0x4000, 0x4001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x5000, 0x6fff) AM_DEVREAD(SOUND, "c140", c140_r) + AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x5000, 0x6fff) AM_DEVREAD("c140", 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(SMH_RAM) @@ -722,8 +722,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x5000, 0x6fff) AM_DEVWRITE(SOUND, "c140", c140_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x5000, 0x6fff) AM_DEVWRITE("c140", 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(SMH_RAM) diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index e9f2b6009fe..a2d2ceaabd4 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1402,8 +1402,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(BANKED_SOUND_ROM_R) /* banked */ - AM_RANGE(0x4000, 0x4001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x5000, 0x6fff) AM_DEVREAD(SOUND, "c140", c140_r) + AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x5000, 0x6fff) AM_DEVREAD("c140", 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(SMH_RAM) @@ -1413,8 +1413,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3003) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x5000, 0x6fff) AM_DEVWRITE(SOUND, "c140", c140_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x5000, 0x6fff) AM_DEVWRITE("c140", 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(SMH_RAM) diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 4ae9b839655..e4a77ee2dcb 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2474,7 +2474,7 @@ static MACHINE_RESET(namcoss22) // Super System 22 M37710 static ADDRESS_MAP_START( mcu_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE( SOUND, "c352", c352_r, c352_w ) + AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE( "c352", c352_r, c352_w ) AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( s22mcu_shared_r, s22mcu_shared_w ) AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("user4", 0xc000) AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("user4", 0) @@ -2486,7 +2486,7 @@ ADDRESS_MAP_END // System 22 37702 static ADDRESS_MAP_START( mcu_s22_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE( SOUND, "c352", c352_r, c352_w ) + AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE( "c352", c352_r, c352_w ) AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( s22mcu_shared_r, s22mcu_shared_w ) AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("mcu", 0) AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("user4", 0) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 23793dc133f..b1bdb357e00 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1090,7 +1090,7 @@ static WRITE16_HANDLER(cause_sync_w) static ADDRESS_MAP_START( s23h8rwmap, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREADWRITE( SOUND, "c352", c352_r, c352_w ) + AM_RANGE(0x280000, 0x287fff) AM_DEVREADWRITE( "c352", c352_r, c352_w ) AM_RANGE(0x300000, 0x300001) AM_READNOP //AM_READ_PORT("IN1") AM_RANGE(0x300002, 0x300003) AM_READNOP //AM_READ_PORT("IN2") AM_RANGE(0x300010, 0x300011) AM_NOP diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index 0d6112c8728..abd2199d05e 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -327,7 +327,7 @@ static WRITE8_HANDLER( cus115_w ) case 1: case 2: case 3: - namco_63701x_w(devtag_get_device(space->machine, SOUND, "namco2"), (offset & 0x1e00) >> 9,data); + namco_63701x_w(devtag_get_device(space->machine, "namco2"), (offset & 0x1e00) >> 9,data); break; case 4: @@ -356,7 +356,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READWRITE(rthunder_videoram1_r,rthunder_videoram1_w) AM_BASE(&rthunder_videoram1) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(rthunder_videoram2_r,rthunder_videoram2_w) AM_BASE(&rthunder_videoram2) - AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata) /* PSG device, shared RAM */ + AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata) /* PSG device, shared RAM */ AM_RANGE(0x4000, 0x5fff) AM_READWRITE(rthunder_spriteram_r,rthunder_spriteram_w) @@ -412,9 +412,9 @@ CPU2_MEMORY( wndrmomo, 0x2000, 0x4000, 0x6000, UNUSED, UNUSED, 0xc000, 0xc800 ) static ADDRESS_MAP_START( NAME##_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) \ AM_RANGE(0x0000, 0x001f) AM_READWRITE(hd63701_internal_registers_r,hd63701_internal_registers_w) \ AM_RANGE(0x0080, 0x00ff) AM_RAM \ - AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */ \ + AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */ \ AM_RANGE(0x1400, 0x1fff) AM_RAM \ - AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) \ + AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) \ AM_RANGE(ADDR_INPUT+0x20, ADDR_INPUT+0x20) AM_READ_PORT("IN0") \ AM_RANGE(ADDR_INPUT+0x21, ADDR_INPUT+0x21) AM_READ_PORT("IN1") \ AM_RANGE(ADDR_INPUT+0x30, ADDR_INPUT+0x30) AM_READ(dsw0_r) \ diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index d45cace8744..829fc58a856 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -745,7 +745,7 @@ static ADDRESS_MAP_START( naomi_base_map, ADDRESS_SPACE_PROGRAM, 64 ) AM_RANGE(0x005f7c00, 0x005f7cff) AM_READWRITE( pvr_ctrl_r, pvr_ctrl_w ) AM_RANGE(0x005f8000, 0x005f9fff) AM_READWRITE( pvr_ta_r, pvr_ta_w ) AM_RANGE(0x00600000, 0x006007ff) AM_READWRITE( dc_modem_r, dc_modem_w ) - AM_RANGE(0x00700000, 0x00707fff) AM_DEVREADWRITE( SOUND, "aica", dc_aica_reg_r, dc_aica_reg_w ) + AM_RANGE(0x00700000, 0x00707fff) AM_DEVREADWRITE( "aica", dc_aica_reg_r, dc_aica_reg_w ) AM_RANGE(0x00710000, 0x0071000f) AM_READWRITE( dc_rtc_r, dc_rtc_w ) AM_RANGE(0x00800000, 0x00ffffff) AM_READWRITE( naomi_arm_r, naomi_arm_w ) // sound RAM (8 MB) AM_RANGE(0x0103ff00, 0x0103ffff) AM_READWRITE( naomi_unknown1_r, naomi_unknown1_w ) // bios uses it, actual start and end addresses not known @@ -773,7 +773,7 @@ static ADDRESS_MAP_START( naomi_map, ADDRESS_SPACE_PROGRAM, 64 ) AM_RANGE(0x005f7c00, 0x005f7cff) AM_READWRITE( pvr_ctrl_r, pvr_ctrl_w ) AM_RANGE(0x005f8000, 0x005f9fff) AM_READWRITE( pvr_ta_r, pvr_ta_w ) AM_RANGE(0x00600000, 0x006007ff) AM_READWRITE( dc_modem_r, dc_modem_w ) - AM_RANGE(0x00700000, 0x00707fff) AM_DEVREADWRITE( SOUND, "aica", dc_aica_reg_r, dc_aica_reg_w ) + AM_RANGE(0x00700000, 0x00707fff) AM_DEVREADWRITE( "aica", dc_aica_reg_r, dc_aica_reg_w ) AM_RANGE(0x00710000, 0x0071000f) AM_READWRITE( dc_rtc_r, dc_rtc_w ) AM_RANGE(0x00800000, 0x00ffffff) AM_READWRITE( naomi_arm_r, naomi_arm_w ) // sound RAM (8 MB) AM_RANGE(0x0103ff00, 0x0103ffff) AM_READWRITE( naomi_unknown1_r, naomi_unknown1_w ) // bios uses it, actual start and end addresses not known @@ -786,7 +786,7 @@ static ADDRESS_MAP_START( naomi_map, ADDRESS_SPACE_PROGRAM, 64 ) AM_RANGE(0x13000000, 0x13ffffff) AM_RAM AM_SHARE(2) // another mirror of texture memory AM_RANGE(0xa0000000, 0xa01fffff) AM_ROM AM_REGION("maincpu", 0) - AM_RANGE(0x005f7000, 0x005f70ff) AM_DEVREADWRITE(NAOMI_BOARD, "rom_board", naomibd_r, naomibd_w) + AM_RANGE(0x005f7000, 0x005f70ff) AM_DEVREADWRITE("rom_board", naomibd_r, naomibd_w) ADDRESS_MAP_END @@ -816,7 +816,7 @@ static const aica_interface aica_config = static ADDRESS_MAP_START( dc_audio_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE( &dc_sound_ram ) /* shared with SH-4 */ - AM_RANGE(0x00800000, 0x00807fff) AM_DEVREADWRITE(SOUND, "aica", dc_arm_aica_r, dc_arm_aica_w) + AM_RANGE(0x00800000, 0x00807fff) AM_DEVREADWRITE("aica", dc_arm_aica_r, dc_arm_aica_w) ADDRESS_MAP_END /* @@ -856,7 +856,7 @@ INPUT_PORTS_END static MACHINE_RESET( naomi ) { MACHINE_RESET_CALL(dc); - aica_set_ram_base(devtag_get_device(machine, SOUND, "aica"), dc_sound_ram, 8*1024*1024); + aica_set_ram_base(devtag_get_device(machine, "aica"), dc_sound_ram, 8*1024*1024); } /* diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index 8ae5f84d721..6437c8f49b8 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -323,7 +323,7 @@ static READ8_HANDLER( ff_r ) static ADDRESS_MAP_START( readport_secolove, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "psg", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("psg", ay8910_r) 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) @@ -335,12 +335,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_secolove, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_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(nbmj8688_clut_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(secolove_romsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -354,7 +354,7 @@ static WRITE8_HANDLER( barline_output_w ) static ADDRESS_MAP_START( readport_barline, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x80, 0x81) AM_DEVREAD(SOUND, "psg", ym3812_r) + AM_RANGE(0x80, 0x81) AM_DEVREAD("psg", ym3812_r) 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) @@ -367,12 +367,12 @@ static ADDRESS_MAP_START( writeport_barline, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0x70, 0x70) AM_WRITE(nb1413m3_nmi_clock_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "psg", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("psg", ym3812_w) AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(barline_output_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj8688_clut_w) -// AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) //not used +// AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) //not used AM_RANGE(0xe0, 0xe0) AM_WRITE(secolove_romsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -380,12 +380,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_crystalg, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_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(nbmj8688_clut_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(crystalg_romsel_w) // AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -394,7 +394,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_otonano, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x80, 0x81) AM_DEVREAD(SOUND, "psg", ym3812_r) + AM_RANGE(0x80, 0x81) AM_DEVREAD("psg", ym3812_r) 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) @@ -409,10 +409,10 @@ static ADDRESS_MAP_START( writeport_otonano, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w) AM_RANGE(0x70, 0x77) AM_WRITE(nbmj8688_blitter_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "psg", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("psg", ym3812_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -421,7 +421,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_kaguya, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "psg", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("psg", ay8910_r) 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) @@ -436,10 +436,10 @@ static ADDRESS_MAP_START( writeport_kaguya, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w) AM_RANGE(0x70, 0x77) AM_WRITE(nbmj8688_blitter_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -452,10 +452,10 @@ static ADDRESS_MAP_START( writeport_iemoto, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(nb1413m3_sndrombank2_w) AM_RANGE(0x40, 0x47) AM_WRITE(nbmj8688_blitter_w) AM_RANGE(0x50, 0x50) AM_WRITE(seiha_romsel_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -467,11 +467,11 @@ static ADDRESS_MAP_START( writeport_seiha, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(nb1413m3_sndrombank2_w) AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(seiha_romsel_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -482,10 +482,10 @@ static ADDRESS_MAP_START( writeport_mjgaiden, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w) AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -499,12 +499,12 @@ static ADDRESS_MAP_START( writeport_p16bit_LCD, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x45, 0x45) AM_WRITE(nbmj8688_HD61830B_1_instr_w) AM_RANGE(0x46, 0x46) AM_WRITE(nbmj8688_HD61830B_both_data_w) AM_RANGE(0x47, 0x47) AM_WRITE(nbmj8688_HD61830B_both_instr_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_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(nbmj8688_clut_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(secolove_romsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -528,10 +528,10 @@ static ADDRESS_MAP_START( writeport_mjsikaku, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w) AM_RANGE(0x60, 0x67) AM_WRITE(nbmj8688_blitter_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "psg", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("psg", ym3812_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END @@ -540,7 +540,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mmsikaku, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "psg", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("psg", ay8910_r) 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) @@ -556,10 +556,10 @@ static ADDRESS_MAP_START( writeport_mmsikaku, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w) AM_RANGE(0x40, 0x47) AM_WRITE(nbmj8688_blitter_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "psg", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("psg", ay8910_data_address_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 702222d1bed..a65e628001b 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -521,11 +521,11 @@ static ADDRESS_MAP_START( writeport_gionbana, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(SMH_NOP) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -537,11 +537,11 @@ static ADDRESS_MAP_START( writeport_mgion, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(SMH_NOP) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -549,7 +549,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_omotesnd, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "fm", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) 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) @@ -568,12 +568,12 @@ static ADDRESS_MAP_START( writeport_omotesnd, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w) // AM_RANGE(0x50, 0x50) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "fm", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) 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(SMH_NOP) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -584,11 +584,11 @@ static ADDRESS_MAP_START( writeport_hanamomo, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(SMH_NOP) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) // AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -600,11 +600,11 @@ static ADDRESS_MAP_START( writeport_msjiken, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(SMH_NOP) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) // AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -616,11 +616,11 @@ static ADDRESS_MAP_START( writeport_scandal, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(nb1413m3_nmi_clock_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) // AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -628,7 +628,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_scandalm, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "fm", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) 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) @@ -644,11 +644,11 @@ static ADDRESS_MAP_START( writeport_scandalm, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "fm", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_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(nb1413m3_nmi_clock_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -661,11 +661,11 @@ static ADDRESS_MAP_START( writeport_bananadr, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w) AM_RANGE(0x30, 0x30) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(nb1413m3_nmi_clock_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -688,11 +688,11 @@ static ADDRESS_MAP_START( writeport_lovehous, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) // 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_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -715,11 +715,11 @@ static ADDRESS_MAP_START( writeport_maiko, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w) AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(SMH_NOP) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -727,7 +727,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_taiwanmb, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "fm", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) 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) @@ -740,12 +740,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_taiwanmb, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "fm", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) // 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(SMH_NOP) // ? - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_taiwanmb_gfxdraw_w) // blitter draw start AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index e6da25e8ab2..8786399ac48 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -330,11 +330,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_galkoku, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_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(nb1413m3_nmi_clock_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -342,7 +342,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_hyouban, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "fm", ay8910_r) + AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) 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) @@ -354,11 +354,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_hyouban, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "fm", ay8910_data_address_w) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_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(nb1413m3_nmi_clock_w) - AM_RANGE(0xd0, 0xd0) AM_DEVWRITE(SOUND, "dac", DAC_WRITE) + AM_RANGE(0xd0, 0xd0) AM_DEVWRITE("dac", DAC_WRITE) // AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -416,11 +416,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport_nbmj8991, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "dac1", DAC_WRITE) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "dac2", DAC_WRITE) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", DAC_WRITE) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac2", DAC_WRITE) AM_RANGE(0x04, 0x04) AM_WRITE(nbmj8991_soundbank_w) AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "fm", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("fm", ym3812_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index de3c38a6d97..bfa6aea02c6 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -359,10 +359,10 @@ static WRITE8_HANDLER( tmpz84c011_pio_w ) nbmj9195_soundbank_w(space, 0, data); break; case 6: /* PB_1 */ - DAC_WRITE(devtag_get_device(space->machine, SOUND, "dac2"), 0, data); + DAC_WRITE(devtag_get_device(space->machine, "dac2"), 0, data); break; case 7: /* PC_1 */ - DAC_WRITE(devtag_get_device(space->machine, SOUND, "dac1"), 0, data); + DAC_WRITE(devtag_get_device(space->machine, "dac1"), 0, data); break; case 8: /* PD_1 */ break; @@ -397,10 +397,10 @@ static WRITE8_HANDLER( tmpz84c011_pio_w ) nbmj9195_soundbank_w(space, 0, data); break; case 6: /* PB_1 */ - DAC_WRITE(devtag_get_device(space->machine, SOUND, "dac2"), 0, data); + DAC_WRITE(devtag_get_device(space->machine, "dac2"), 0, data); break; case 7: /* PC_1 */ - DAC_WRITE(devtag_get_device(space->machine, SOUND, "dac1"), 0, data); + DAC_WRITE(devtag_get_device(space->machine, "dac1"), 0, data); break; case 8: /* PD_1 */ break; @@ -482,7 +482,7 @@ static void ctc1_interrupt(const device_config *device, int state) /* CTC of main cpu, ch0 trigger is vblank */ static INTERRUPT_GEN( ctc0_trg1 ) { - const device_config *ctc = devtag_get_device(device->machine, Z80CTC, "main_ctc"); + const device_config *ctc = devtag_get_device(device->machine, "main_ctc"); z80ctc_trg1_w(ctc, 0, 1); z80ctc_trg1_w(ctc, 0, 0); } @@ -625,7 +625,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mjuraden, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -642,7 +642,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mjuraden, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -667,7 +667,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_koinomp, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -685,7 +685,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_koinomp, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -713,7 +713,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_patimono, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -731,7 +731,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_patimono, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -758,7 +758,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mmehyou, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -775,7 +775,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mmehyou, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -800,7 +800,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_gal10ren, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -818,7 +818,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_gal10ren, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -845,7 +845,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_renaiclb, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -863,7 +863,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_renaiclb, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -890,7 +890,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mjlaman, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -908,7 +908,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mjlaman, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -935,7 +935,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mkeibaou, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -953,7 +953,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mkeibaou, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -980,7 +980,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_pachiten, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -998,7 +998,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_pachiten, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1025,7 +1025,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_sailorws, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1043,7 +1043,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_sailorws, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1070,7 +1070,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_sailorwr, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1088,7 +1088,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_sailorwr, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1115,7 +1115,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_psailor1, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1133,7 +1133,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_psailor1, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1160,7 +1160,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_psailor2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1178,7 +1178,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_psailor2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1205,7 +1205,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_otatidai, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1223,7 +1223,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_otatidai, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1250,7 +1250,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_yosimoto, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1268,7 +1268,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_yosimoto, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1295,7 +1295,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_jituroku, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1313,7 +1313,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_jituroku, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1340,7 +1340,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_ngpgal, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1357,7 +1357,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_ngpgal, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1382,7 +1382,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mjgottsu, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1399,7 +1399,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mjgottsu, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1424,7 +1424,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_cmehyou, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1441,7 +1441,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_cmehyou, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1466,7 +1466,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mjkoiura, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1483,7 +1483,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mjkoiura, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1508,7 +1508,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mkoiuraa, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1525,7 +1525,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mkoiuraa, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1550,7 +1550,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mscoutm, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1571,7 +1571,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mscoutm, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1597,7 +1597,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_imekura, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1618,7 +1618,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_imekura, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1644,7 +1644,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_mjegolf, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "main_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("main_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_0_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_0_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_0_pc_r) @@ -1665,7 +1665,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_mjegolf, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "main_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("main_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_0_pc_w) @@ -1691,7 +1691,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREAD(Z80CTC, "audio_ctc", z80ctc_r) + AM_RANGE(0x10, 0x13) AM_DEVREAD("audio_ctc", z80ctc_r) AM_RANGE(0x50, 0x50) AM_READ(tmpz84c011_1_pa_r) AM_RANGE(0x51, 0x51) AM_READ(tmpz84c011_1_pb_r) AM_RANGE(0x52, 0x52) AM_READ(tmpz84c011_1_pc_r) @@ -1706,7 +1706,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVWRITE(Z80CTC, "audio_ctc", z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVWRITE("audio_ctc", z80ctc_w) AM_RANGE(0x50, 0x50) AM_WRITE(tmpz84c011_1_pa_w) AM_RANGE(0x51, 0x51) AM_WRITE(tmpz84c011_1_pb_w) AM_RANGE(0x52, 0x52) AM_WRITE(tmpz84c011_1_pc_w) @@ -1718,7 +1718,7 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x34, 0x34) AM_WRITE(tmpz84c011_1_dir_pd_w) AM_RANGE(0x44, 0x44) AM_WRITE(tmpz84c011_1_dir_pe_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym", ym3812_w) ADDRESS_MAP_END @@ -3609,13 +3609,13 @@ INPUT_PORTS_END static const z80_daisy_chain daisy_chain_main[] = { - { Z80CTC, "main_ctc" }, + { "main_ctc" }, { NULL } }; static const z80_daisy_chain daisy_chain_sound[] = { - { Z80CTC, "audio_ctc" }, + { "audio_ctc" }, { NULL } }; diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 3074fcdd07b..82f7d7c0210 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -291,7 +291,7 @@ static READ8_DEVICE_HANDLER( nemesis_portA_r ) bit 7: unused by this software version. Bubble Memory version uses this bit. */ - const device_config *vlm = devtag_get_device(device->machine, SOUND, "vlm"); + const device_config *vlm = devtag_get_device(device->machine, "vlm"); int res = (cputag_get_total_cycles(device->machine, "audiocpu") / 1024) & 0x2f; // this should be 0x0f, but it doesn't work res |= 0xd0; @@ -305,17 +305,17 @@ static READ8_DEVICE_HANDLER( nemesis_portA_r ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM - AM_RANGE(0xa000, 0xafff) AM_DEVWRITE(SOUND, "konami", k005289_pitch_A_w) - AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE(SOUND, "konami", k005289_pitch_B_w) + AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("konami", k005289_pitch_A_w) + AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("konami", k005289_pitch_B_w) AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_r) - AM_RANGE(0xe003, 0xe003) AM_DEVWRITE(SOUND, "konami", k005289_keylatch_A_w) - AM_RANGE(0xe004, 0xe004) AM_DEVWRITE(SOUND, "konami", k005289_keylatch_B_w) - AM_RANGE(0xe005, 0xe005) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0xe006, 0xe006) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0xe086, 0xe086) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xe106, 0xe106) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0xe205, 0xe205) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0xe405, 0xe405) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0xe003, 0xe003) AM_DEVWRITE("konami", k005289_keylatch_A_w) + AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("konami", k005289_keylatch_B_w) + AM_RANGE(0xe005, 0xe005) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0xe006, 0xe006) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0xe086, 0xe086) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xe106, 0xe106) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0xe205, 0xe205) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0xe405, 0xe405) AM_DEVWRITE("ay2", ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( konamigt_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -424,19 +424,19 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gx400_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x4000, 0x87ff) AM_RAM AM_BASE(&gx400_shared_ram) - AM_RANGE(0xa000, 0xafff) AM_DEVWRITE(SOUND, "konami", k005289_pitch_A_w) - AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE(SOUND, "konami", k005289_pitch_B_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) + AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("konami", k005289_pitch_A_w) + AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("konami", k005289_pitch_B_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("vlm", vlm5030_data_w) AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_r) - AM_RANGE(0xe003, 0xe003) AM_DEVWRITE(SOUND, "konami", k005289_keylatch_A_w) - AM_RANGE(0xe004, 0xe004) AM_DEVWRITE(SOUND, "konami", k005289_keylatch_B_w) - AM_RANGE(0xe005, 0xe005) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0xe006, 0xe006) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0xe030, 0xe030) AM_DEVWRITE(SOUND, "vlm", gx400_speech_start_w) - AM_RANGE(0xe086, 0xe086) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xe106, 0xe106) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0xe205, 0xe205) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0xe405, 0xe405) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0xe003, 0xe003) AM_DEVWRITE("konami", k005289_keylatch_A_w) + AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("konami", k005289_keylatch_B_w) + AM_RANGE(0xe005, 0xe005) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0xe006, 0xe006) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0xe030, 0xe030) AM_DEVWRITE("vlm", gx400_speech_start_w) + AM_RANGE(0xe086, 0xe086) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xe106, 0xe106) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0xe205, 0xe205) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0xe405, 0xe405) AM_DEVWRITE("ay2", ay8910_data_w) ADDRESS_MAP_END /******************************************************************************/ @@ -561,32 +561,32 @@ static ADDRESS_MAP_START( sal_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("vlm", vlm5030_data_w) AM_RANGE(0xe000, 0xe000) AM_READ(wd_r) /* watchdog?? */ - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE(SOUND, "vlm", salamand_speech_start_w) + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("vlm", salamand_speech_start_w) ADDRESS_MAP_END static ADDRESS_MAP_START( blkpnthr_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xe000, 0xe000) AM_READ(wd_r) /* watchdog?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( city_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x9800, 0x987f) AM_DEVWRITE(SOUND, "konami2", k051649_waveform_w) - AM_RANGE(0x9880, 0x9889) AM_DEVWRITE(SOUND, "konami2", k051649_frequency_w) - AM_RANGE(0x988a, 0x988e) AM_DEVWRITE(SOUND, "konami2", k051649_volume_w) - AM_RANGE(0x988f, 0x988f) AM_DEVWRITE(SOUND, "konami2", k051649_keyonoff_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "konami", city_sound_bank_w) /* 7232 bankswitch */ + AM_RANGE(0x9800, 0x987f) AM_DEVWRITE("konami2", k051649_waveform_w) + AM_RANGE(0x9880, 0x9889) AM_DEVWRITE("konami2", k051649_frequency_w) + AM_RANGE(0x988a, 0x988e) AM_DEVWRITE("konami2", k051649_volume_w) + AM_RANGE(0x988f, 0x988f) AM_DEVWRITE("konami2", k051649_keyonoff_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("konami", city_sound_bank_w) /* 7232 bankswitch */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -1891,8 +1891,8 @@ static const ay8910_interface ay8910_interface_2 = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "konami", k005289_control_A_w), - DEVCB_DEVICE_HANDLER(SOUND, "konami", k005289_control_B_w) + DEVCB_DEVICE_HANDLER("konami", k005289_control_A_w), + DEVCB_DEVICE_HANDLER("konami", k005289_control_B_w) }; static void sound_irq(const device_config *device, int state) diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 69734992853..ee8d6aedb79 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -1084,7 +1084,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( auido_io_map, ADDRESS_SPACE_IO, 8 ) /*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/ /* may not and NMI clear */ AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r) - AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) /* write - NMI enable / acknowledge? (the data written doesn't matter) */ AM_RANGE(0x08, 0x08) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_f000_f7ff_r) AM_RANGE(0x09, 0x09) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_e000_efff_r) diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index 5342a1a3dcf..ea2cf86f9dd 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -24,7 +24,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("INPUTS") - AM_RANGE(0xc002, 0xc002) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xc002, 0xc002) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -33,7 +33,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "oki", okim6295_w) /* ?? */ + AM_RANGE(0xc002, 0xc002) AM_DEVWRITE("oki", okim6295_w) /* ?? */ AM_RANGE(0xc003, 0xc003) AM_WRITE(news_bgpic_w) AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index c634b5be614..275e95c7e61 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -376,8 +376,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nightgal_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01,0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) //ay read port - AM_RANGE(0x02,0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01,0x01) AM_DEVREAD("ay", ay8910_r) //ay read port + AM_RANGE(0x02,0x03) AM_DEVWRITE("ay", ay8910_data_address_w) // AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSWC") AM_RANGE(0x11,0x11) AM_READ_PORT("SYSA") @@ -416,7 +416,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sexygal_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00,0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00,0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSWC") AM_RANGE(0x11,0x11) AM_READ_PORT("SYSA") diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 7bc7c3465d0..8b92b0bf1b8 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -219,7 +219,7 @@ static SAMPLES_START( ninjakd2_init_samples ) static WRITE8_HANDLER( ninjakd2_pcm_play_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "pcm"); + const device_config *samples = devtag_get_device(space->machine, "pcm"); const UINT8* const rom = memory_region(space->machine, "pcm"); // only Ninja Kid II uses this @@ -471,8 +471,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ninjakd2_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "2203.1", ym2203_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "2203.2", ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("2203.1", ym2203_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("2203.2", ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 0fd1ef49bfb..08955b67143 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -275,7 +275,7 @@ static WRITE8_HANDLER( ninjaw_pancontrol ) offset = offset&3; ninjaw_pandata[offset] = (float)data * (100.f / 255.0f); //popmessage(" pan %02x %02x %02x %02x", ninjaw_pandata[0], ninjaw_pandata[1], ninjaw_pandata[2], ninjaw_pandata[3] ); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, fltname[offset]), ninjaw_pandata[offset] / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, fltname[offset]), ninjaw_pandata[offset] / 100.0); } @@ -410,7 +410,7 @@ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -419,7 +419,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(ninjaw_pancontrol) /* pan */ diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 48a5c59181b..c9de62befb4 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -122,10 +122,10 @@ static WRITE8_HANDLER( tmpz84c011_pio_w) niyanpai_soundbank_w(space->machine, data & 0x03); break; case 1: /* PB_0 */ - DAC_WRITE(devtag_get_device(space->machine, SOUND, "dac2"), 0, data); + DAC_WRITE(devtag_get_device(space->machine, "dac2"), 0, data); break; case 2: /* PC_0 */ - DAC_WRITE(devtag_get_device(space->machine, SOUND, "dac1"), 0, data); + DAC_WRITE(devtag_get_device(space->machine, "dac1"), 0, data); break; case 3: /* PD_0 */ break; @@ -466,7 +466,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_0_pa_r, tmpz84c011_0_pa_w) AM_RANGE(0x51, 0x51) AM_READWRITE(tmpz84c011_0_pb_r, tmpz84c011_0_pb_w) AM_RANGE(0x52, 0x52) AM_READWRITE(tmpz84c011_0_pc_r, tmpz84c011_0_pc_w) @@ -477,7 +477,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x56, 0x56) AM_READWRITE(tmpz84c011_0_dir_pc_r, tmpz84c011_0_dir_pc_w) AM_RANGE(0x34, 0x34) AM_READWRITE(tmpz84c011_0_dir_pd_r, tmpz84c011_0_dir_pd_w) AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_0_dir_pe_r, tmpz84c011_0_dir_pe_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym", ym3812_w) ADDRESS_MAP_END @@ -839,7 +839,7 @@ static INTERRUPT_GEN( niyanpai_interrupt ) static const z80_daisy_chain daisy_chain_sound[] = { - { Z80CTC, "ctc" }, + { "ctc" }, { NULL } }; diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 6d6122fe42f..5d6b09b2f82 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -346,10 +346,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "oki", oki_banking_w) - AM_RANGE(0x10, 0x11) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki", oki_banking_w) + AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r) - AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END static INPUT_PORTS_START( nmg5 ) diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 44c5421b0bf..56bb0ffcce5 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -376,23 +376,23 @@ static ADDRESS_MAP_START( tharrier_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0xf500, 0xf500) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0xf400, 0xf400) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0xf500, 0xf500) AM_DEVREAD("oki2", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0xf500, 0xf500) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0xf500, 0xf500) AM_DEVWRITE("oki2", okim6295_w) AM_RANGE(0xf600, 0xf600) AM_WRITE(tharrier_oki6295_bankswitch_0_w) AM_RANGE(0xf700, 0xf700) AM_WRITE(tharrier_oki6295_bankswitch_1_w) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1001,7 +1001,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ssmissin_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki1", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki1", okim6295_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -1009,7 +1009,7 @@ static ADDRESS_MAP_START( ssmissin_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "oki1", okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki1", okim6295_w) ADDRESS_MAP_END @@ -1149,9 +1149,9 @@ 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( SMH_BANK1 ) - AM_RANGE( 0xc000, 0xc001 ) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w ) - AM_RANGE( 0xc800, 0xc800 ) AM_DEVREADWRITE( SOUND, "oki1", okim6295_r, okim6295_w ) - AM_RANGE( 0xc808, 0xc808 ) AM_DEVREADWRITE( SOUND, "oki2", okim6295_r, okim6295_w ) + AM_RANGE( 0xc000, 0xc001 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) + AM_RANGE( 0xc800, 0xc800 ) AM_DEVREADWRITE( "oki1", okim6295_r, okim6295_w ) + AM_RANGE( 0xc808, 0xc808 ) AM_DEVREADWRITE( "oki2", okim6295_r, okim6295_w ) AM_RANGE( 0xc810, 0xc817 ) AM_WRITE( NMK112_okibank_w ) // AM_RANGE( 0xc810, 0xc817 ) AM_WRITE( okibank_w ) AM_RANGE( 0xd000, 0xd000 ) AM_WRITE( raphero_sound_rombank_w ) @@ -1176,9 +1176,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x88, 0x88) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x88, 0x88) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x90, 0x97) AM_WRITE(NMK112_okibank_w) ADDRESS_MAP_END @@ -1188,8 +1188,8 @@ static ADDRESS_MAP_START( bjtwin_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1") AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1") AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2") - AM_RANGE(0x084000, 0x084001) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff) - AM_RANGE(0x084010, 0x084011) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff) + AM_RANGE(0x084000, 0x084001) AM_DEVREAD8("oki1", okim6295_r, 0x00ff) + AM_RANGE(0x084010, 0x084011) AM_DEVREAD8("oki2", okim6295_r, 0x00ff) 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 */ @@ -1198,8 +1198,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bjtwin_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x084000, 0x084001) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff) - AM_RANGE(0x084010, 0x084011) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff) + AM_RANGE(0x084000, 0x084001) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) + AM_RANGE(0x084010, 0x084011) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff) 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) @@ -4801,17 +4801,17 @@ static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) // From Main CPU - AM_RANGE(0xf808, 0xf809) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) // YM2151 - AM_RANGE(0xf80a, 0xf80a) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) // M6295 + AM_RANGE(0xf808, 0xf809) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) // YM2151 + AM_RANGE(0xf80a, 0xf80a) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) // M6295 ADDRESS_MAP_END static ADDRESS_MAP_START( firehawk_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xfff0, 0xfff0) AM_READ(soundlatch_r) - AM_RANGE(0xfff2, 0xfff2) AM_DEVWRITE(SOUND, "oki2", spec2k_oki1_banking_w ) - AM_RANGE(0xfff8, 0xfff8) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) - AM_RANGE(0xfffa, 0xfffa) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) + AM_RANGE(0xfff2, 0xfff2) AM_DEVWRITE("oki2", spec2k_oki1_banking_w ) + AM_RANGE(0xfff8, 0xfff8) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) + AM_RANGE(0xfffa, 0xfffa) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0xf800, 0xffff) AM_RAM // not used, only tested ADDRESS_MAP_END @@ -4829,8 +4829,8 @@ static WRITE8_DEVICE_HANDLER( twinactn_oki_bank_w ) static ADDRESS_MAP_START( twinactn_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "oki1", twinactn_oki_bank_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki1", twinactn_oki_bank_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) // From Main CPU ADDRESS_MAP_END diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 0251badd55a..c33d89d162e 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -271,7 +271,7 @@ static WRITE8_DEVICE_HANDLER( sndlamp_w ) output_set_lamp_value(9, (data >> 1) & 1); /* Bet */ /* the 4 MSB are for discrete (or DAC) sound */ - dac_data_w(devtag_get_device(device->machine, SOUND, "dac"), (data & 0xf0)); /* Sound DAC? */ + dac_data_w(devtag_get_device(device->machine, "dac"), (data & 0xf0)); /* Sound DAC? */ } /*game waits for bit 7 (0x80) to be set.*/ @@ -302,12 +302,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( norautp_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xa0, 0xa3) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x60, 0x63) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xa0, 0xa3) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(vram_data_w) AM_RANGE(0xc1, 0xc1) AM_WRITE(vram_addr_w) AM_RANGE(0xc2, 0xc2) AM_READ(test_r) -// AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) +// AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) ADDRESS_MAP_END /* @@ -327,12 +327,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gtipoker_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7c, 0x7f) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xbc, 0xbf) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x7c, 0x7f) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xbc, 0xbf) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xdc, 0xdc) AM_WRITE(vram_data_w) AM_RANGE(0xdd, 0xdd) AM_WRITE(vram_addr_w) AM_RANGE(0xde, 0xde) AM_READ(test_r) -// AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) +// AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) AM_RANGE(0xef, 0xef) AM_READ(test_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index 7abd00a5e17..4a5eb86c107 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -179,10 +179,10 @@ static ADDRESS_MAP_START( nova2001_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE(&nova2001_bg_videoram) AM_RANGE(0xb000, 0xb7ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0xb800, 0xbfff) AM_WRITE(nova2001_flipscreen_w) - AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) - AM_RANGE(0xc002, 0xc002) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0xc003, 0xc003) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0xc002, 0xc002) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0xc003, 0xc003) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0xc004, 0xc004) AM_READ(watchdog_reset_r) AM_RANGE(0xc006, 0xc006) AM_READ_PORT("IN0") AM_RANGE(0xc007, 0xc007) AM_READ_PORT("IN1") @@ -194,10 +194,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ninjakun_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8001, 0x8001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8002, 0x8003) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8003, 0x8003) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8002, 0x8003) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8003, 0x8003) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0") AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1") AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2") AM_WRITE(ninjakun_cpu1_io_A002_w) @@ -213,10 +213,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ninjakun_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x7fff) AM_ROM AM_REGION("maincpu", 0x2000) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8001, 0x8001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8002, 0x8002) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8003, 0x8003) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8003, 0x8003) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0") AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1") AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2") AM_WRITE(ninjakun_cpu2_io_A002_w) @@ -234,10 +234,10 @@ static ADDRESS_MAP_START( pkunwar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE(&nova2001_bg_videoram) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xa001, 0xa001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xa002, 0xa002) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0xa003, 0xa003) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xa001, 0xa001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xa002, 0xa002) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0xa003, 0xa003) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -256,20 +256,20 @@ static ADDRESS_MAP_START( raiders5_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa000) AM_WRITE(nova2001_scroll_x_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(nova2001_scroll_y_w) AM_RANGE(0xa002, 0xa002) AM_WRITE(pkunwar_flipscreen_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xc001, 0xc001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xc002, 0xc002) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0xc003, 0xc003) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xc002, 0xc002) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0xc003, 0xc003) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE(1) ADDRESS_MAP_END static ADDRESS_MAP_START( raiders5_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8001, 0x8001) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8002, 0x8003) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8003, 0x8003) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8002, 0x8003) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8003, 0x8003) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0x9000, 0x9000) AM_READ(SMH_NOP) /* unknown */ AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE(1) AM_RANGE(0xc000, 0xc000) AM_READ(SMH_NOP) /* unknown */ diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 6da8f72f412..1bd06d3c11d 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -660,7 +660,7 @@ static VIDEO_START( nwktr ) static VIDEO_UPDATE( nwktr ) { - const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo"); + const device_config *voodoo = devtag_get_device(screen->machine, "voodoo"); bitmap_fill(bitmap, cliprect, screen->machine->pens[0]); @@ -910,7 +910,7 @@ static ADDRESS_MAP_START( nwktr_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x780c0000, 0x780c0003) AM_READWRITE(cgboard_dsp_comm_r_ppc, cgboard_dsp_comm_w_ppc) AM_RANGE(0x7d000000, 0x7d00ffff) AM_READ(sysreg_r) AM_RANGE(0x7d010000, 0x7d01ffff) AM_WRITE(sysreg_w) - AM_RANGE(0x7d020000, 0x7d021fff) AM_DEVREADWRITE8(M48T58, "m48t58", timekeeper_r, timekeeper_w, 0xffffffff) /* M48T58Y RTC/NVRAM */ + AM_RANGE(0x7d020000, 0x7d021fff) AM_DEVREADWRITE8("m48t58", timekeeper_r, timekeeper_w, 0xffffffff) /* M48T58Y RTC/NVRAM */ AM_RANGE(0x7d030000, 0x7d030007) AM_READ(K056800_host_r) AM_RANGE(0x7d030000, 0x7d030007) AM_WRITE(K056800_host_w) AM_RANGE(0x7d030008, 0x7d03000f) AM_WRITE(K056800_host_w) @@ -926,7 +926,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Work RAM */ - AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE(SOUND, "rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ + AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rf", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */ AM_RANGE(0x300000, 0x30000f) AM_READWRITE(K056800_sound_r, K056800_sound_w) AM_RANGE(0x600000, 0x600001) AM_NOP ADDRESS_MAP_END @@ -949,7 +949,7 @@ static ADDRESS_MAP_START( sharc_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w) AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram_r, dsp_dataram_w) AM_RANGE(0x1400000, 0x14fffff) AM_RAM - AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE(VOODOO_GRAPHICS, "voodoo", nwk_voodoo_0_r, nwk_voodoo_0_w) + AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo", nwk_voodoo_0_r, nwk_voodoo_0_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w) AM_RANGE(0x3500000, 0x35000ff) AM_READWRITE(K033906_0_r, K033906_0_w) AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(5) diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index c0fa4453036..779650287dc 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -368,9 +368,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xc802, 0xc803) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0xc900, 0xc90d) AM_DEVWRITE(SOUND, "msm", msm5232_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xc802, 0xc803) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0xc900, 0xc90d) AM_DEVWRITE("msm", msm5232_w) AM_RANGE(0xca00, 0xca00) AM_WRITE(SMH_NOP) AM_RANGE(0xcb00, 0xcb00) AM_WRITE(SMH_NOP) AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index 18e7b657300..a43d5bf4d38 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -113,8 +113,8 @@ static WRITE8_HANDLER( audio_2_command_w ); static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - const device_config *pia1 = devtag_get_device(device->machine, PIA6821, "pia1"); - const device_config *pia2 = devtag_get_device(device->machine, PIA6821, "pia2"); + const device_config *pia1 = devtag_get_device(device->machine, "pia1"); + const device_config *pia2 = devtag_get_device(device->machine, "pia2"); int combined_state = pianew_get_irq_a(pia1) | pianew_get_irq_b(pia1) | pianew_get_irq_b(pia2); cpu_set_input_line(device->machine->cpu[0], M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); @@ -136,7 +136,7 @@ static WRITE_LINE_DEVICE_HANDLER( main_cpu_firq ) static INTERRUPT_GEN( update_pia_1 ) { - const device_config *pia1 = devtag_get_device(device->machine, PIA6821, "pia1"); + const device_config *pia1 = devtag_get_device(device->machine, "pia1"); /* update the different PIA pins from the input ports */ /* CA1 - copy of PA0 (COIN1) */ @@ -227,7 +227,7 @@ static const pia6821_interface pia_2_intf = static WRITE8_DEVICE_HANDLER(ic48_1_74123_output_changed) { - const device_config *pia2 = devtag_get_device(device->machine, PIA6821, "pia2"); + const device_config *pia2 = devtag_get_device(device->machine, "pia2"); pia_ca1_w(pia2, 0, data); } @@ -399,7 +399,7 @@ static MC6845_END_UPDATE( end_update ) static MC6845_ON_DE_CHANGED( display_enable_changed ) { - ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "ic48_1"), 0, display_enabled); + ttl74123_a_w(devtag_get_device(device->machine, "ic48_1"), 0, display_enabled); } @@ -418,7 +418,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( nyny ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = devtag_get_device(screen->machine, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; @@ -461,7 +461,7 @@ static const ay8910_interface ay8910_37_interface = DEVCB_NULL, DEVCB_NULL, DEVCB_HANDLER(nyny_ay8910_37_port_a_w), - DEVCB_DEVICE_HANDLER(SOUND, "dac", dac_w) + DEVCB_DEVICE_HANDLER("dac", dac_w) }; @@ -499,8 +499,8 @@ static WRITE8_HANDLER( audio_2_command_w ) static READ8_HANDLER( nyny_pia_1_2_r ) { - const device_config *pia1 = devtag_get_device(space->machine, PIA6821, "pia1"); - const device_config *pia2 = devtag_get_device(space->machine, PIA6821, "pia2"); + const device_config *pia1 = devtag_get_device(space->machine, "pia1"); + const device_config *pia2 = devtag_get_device(space->machine, "pia2"); UINT8 ret = 0; /* the address bits are directly connected to the chip selects */ @@ -513,8 +513,8 @@ static READ8_HANDLER( nyny_pia_1_2_r ) static WRITE8_HANDLER( nyny_pia_1_2_w ) { - const device_config *pia1 = devtag_get_device(space->machine, PIA6821, "pia1"); - const device_config *pia2 = devtag_get_device(space->machine, PIA6821, "pia2"); + const device_config *pia1 = devtag_get_device(space->machine, "pia1"); + const device_config *pia2 = devtag_get_device(space->machine, "pia2"); /* the address bits are directly connected to the chip selects */ if (offset & 0x04) pia_w(pia1, offset & 0x03, data); @@ -529,8 +529,8 @@ static ADDRESS_MAP_START( nyny_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x7fff) AM_RAM AM_BASE(&nyny_colorram_2) AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* SRAM (coin counter, shown when holding F2) */ - AM_RANGE(0xa100, 0xa100) AM_MIRROR(0x00fe) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xa101, 0xa101) AM_MIRROR(0x00fe) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xa100, 0xa100) AM_MIRROR(0x00fe) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xa101, 0xa101) AM_MIRROR(0x00fe) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xa200, 0xa20f) AM_MIRROR(0x00f0) AM_READWRITE(nyny_pia_1_2_r, nyny_pia_1_2_w) AM_RANGE(0xa300, 0xa300) AM_MIRROR(0x00ff) AM_READWRITE(soundlatch3_r, audio_1_command_w) AM_RANGE(0xa400, 0xa7ff) AM_NOP @@ -546,10 +546,10 @@ static ADDRESS_MAP_START( nyny_audio_1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0080, 0x0fff) AM_NOP AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_READWRITE(soundlatch_r, audio_1_answer_w) AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0fff) AM_READ_PORT("SW3") - AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0ffc) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x3000, 0x3001) AM_MIRROR(0x0ffc) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x3002, 0x3002) AM_MIRROR(0x0ffc) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x3002, 0x3003) AM_MIRROR(0x0ffc) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0ffc) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x3000, 0x3001) AM_MIRROR(0x0ffc) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x3002, 0x3002) AM_MIRROR(0x0ffc) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x3002, 0x3003) AM_MIRROR(0x0ffc) AM_DEVWRITE("ay2", ay8910_data_address_w) AM_RANGE(0x4000, 0x4fff) AM_NOP AM_RANGE(0x5000, 0x57ff) AM_MIRROR(0x0800) AM_ROM AM_RANGE(0x6000, 0x67ff) AM_MIRROR(0x0800) AM_ROM @@ -562,8 +562,8 @@ static ADDRESS_MAP_START( nyny_audio_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ AM_RANGE(0x0080, 0x0fff) AM_NOP AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_READ(soundlatch2_r) - AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffe) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0ffe) AM_DEVWRITE(SOUND, "ay3", ay8910_data_address_w) + AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffe) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0ffe) AM_DEVWRITE("ay3", ay8910_data_address_w) AM_RANGE(0x3000, 0x6fff) AM_NOP AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index 3d3839506d6..6feda0b1781 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -73,7 +73,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800002, 0x800003) AM_READ_PORT("P2") AM_RANGE(0xa00000, 0xa00001) AM_READ_PORT("DSW1") AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("DSW2") - AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0xc00000, 0xc00001) AM_READ(watchdog_reset16_r) ADDRESS_MAP_END @@ -89,7 +89,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0xb00000, 0xb00001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0xd00000, 0xd00001) AM_WRITE(ohmygod_spritebank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 167094153cb..d10591f79e1 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -88,7 +88,7 @@ static WRITE8_HANDLER( ojankoy_rombank_w ) ojankohs_adpcm_reset = ((data & 0x20) >> 5); if (!ojankohs_adpcm_reset) ojankohs_vclk_left = 0; - msm5205_reset_w(devtag_get_device(space->machine, SOUND, "msm"), !ojankohs_adpcm_reset); + msm5205_reset_w(devtag_get_device(space->machine, "msm"), !ojankohs_adpcm_reset); } static WRITE8_DEVICE_HANDLER( ojankohs_adpcm_reset_w ) @@ -131,7 +131,7 @@ static WRITE8_HANDLER( ojankoc_ctrl_w ) memory_set_bankptr(space->machine, 1, &BANKROM[bank_address]); ojankohs_adpcm_reset = ((data & 0x10) >> 4); - msm5205_reset_w(devtag_get_device(space->machine, SOUND, "msm"), (!(data & 0x10) >> 4)); + msm5205_reset_w(devtag_get_device(space->machine, "msm"), (!(data & 0x10) >> 4)); ojankoc_flipscreen(space, data); } @@ -275,11 +275,11 @@ static ADDRESS_MAP_START( ojankohs_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w) AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankohs_rombank_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ojankohs_gfxreg_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "msm", ojankohs_adpcm_reset_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("msm", ojankohs_adpcm_reset_w) AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) // unknown AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP) // unknown ADDRESS_MAP_END @@ -291,8 +291,8 @@ static ADDRESS_MAP_START( ojankoy_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ojankoy_coinctr_w) AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( ccasino_io_map, ADDRESS_SPACE_IO, 8 ) @@ -300,11 +300,11 @@ static ADDRESS_MAP_START( ccasino_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w) AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankohs_rombank_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ccasino_coinctr_w) - AM_RANGE(0x03, 0x03) AM_READ(ccasino_dipsw3_r) AM_DEVWRITE(SOUND, "msm", ojankohs_adpcm_reset_w) + AM_RANGE(0x03, 0x03) AM_READ(ccasino_dipsw3_r) AM_DEVWRITE("msm", ojankohs_adpcm_reset_w) AM_RANGE(0x04, 0x04) AM_READWRITE(ccasino_dipsw4_r, ojankohs_flipscreen_w) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x08, 0x0f) AM_WRITE(ccasino_palette_w) // 16bit address access AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP) @@ -317,8 +317,8 @@ static ADDRESS_MAP_START( ojankoc_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xfb, 0xfb) AM_WRITE(ojankoc_ctrl_w) AM_RANGE(0xfc, 0xfd) AM_READ(ojankoc_keymatrix_r) AM_RANGE(0xfd, 0xfd) AM_WRITE(ojankohs_portselect_w) - AM_RANGE(0xfe, 0xff) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) - AM_RANGE(0xff, 0xff) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xfe, 0xff) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0xff, 0xff) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 55c4de3831f..d60c12ce928 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -210,7 +210,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6000, 0x63ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x7000, 0x7001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index 4362ab38343..e565d103dad 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -369,8 +369,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) /* likely ay8910 input port, not direct */ - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index 2bced95cbc2..9afb7771d15 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -135,23 +135,23 @@ static ADDRESS_MAP_START( oneshot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x182000, 0x182fff) AM_WRITE(oneshot_bg_videoram_w) AM_BASE(&oneshot_bg_videoram) // credits etc. 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_DEVWRITE(SOUND, "oki", soundbank_w) + AM_RANGE(0x190018, 0x190019) AM_DEVWRITE("oki", soundbank_w) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r) AM_RANGE(0x8001, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xe000, 0xe001) AM_DEVREAD(SOUND, "ym", ym3812_r) - AM_RANGE(0xe010, 0xe010) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xe000, 0xe001) AM_DEVREAD("ym", ym3812_r) + AM_RANGE(0xe010, 0xe010) AM_DEVREAD("oki", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_WRITE(soundlatch_w) AM_RANGE(0x8001, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0xe010, 0xe010) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xe010, 0xe010) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END static INPUT_PORTS_START( oneshot ) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 18be9f7e689..1d1f8778c72 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -134,9 +134,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "ym", ym3812_write_port_w) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 98034baa549..b0b927d8592 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -290,7 +290,7 @@ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0x9000, 0x9001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -322,8 +322,8 @@ static MACHINE_RESET( opwolf ) adpcm_end[0] = adpcm_end[1] = 0; adpcm_data[0] = adpcm_data[1] = -1; - msm5205_reset_w(devtag_get_device(machine, SOUND, "msm1"), 1); - msm5205_reset_w(devtag_get_device(machine, SOUND, "msm2"), 1); + msm5205_reset_w(devtag_get_device(machine, "msm1"), 1); + msm5205_reset_w(devtag_get_device(machine, "msm2"), 1); } static void opwolf_msm5205_vck(const device_config *device) @@ -402,11 +402,11 @@ static WRITE8_HANDLER( opwolf_adpcm_e_w ) static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xb000, 0xb006) AM_DEVWRITE(SOUND, "msm1", opwolf_adpcm_b_w) - AM_RANGE(0xc000, 0xc006) AM_DEVWRITE(SOUND, "msm2", opwolf_adpcm_c_w) + AM_RANGE(0xb000, 0xb006) AM_DEVWRITE("msm1", opwolf_adpcm_b_w) + AM_RANGE(0xc000, 0xc006) AM_DEVWRITE("msm2", opwolf_adpcm_c_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(opwolf_adpcm_d_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(opwolf_adpcm_e_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 924ad219ae9..364c760a738 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -66,7 +66,7 @@ static INTERRUPT_GEN( orbit_interrupt ) static void update_misc_flags(running_machine *machine, UINT8 val) { - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); orbit_misc_flags = val; @@ -130,11 +130,11 @@ static ADDRESS_MAP_START( orbit_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x07ff) AM_READ_PORT("BUTTONS") AM_RANGE(0x3000, 0x33bf) AM_MIRROR(0x0400) AM_RAM_WRITE(orbit_playfield_w) AM_BASE(&orbit_playfield_ram) AM_RANGE(0x33c0, 0x33ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&orbit_sprite_ram) - AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "discrete", orbit_note_w) - AM_RANGE(0x3900, 0x3900) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "discrete", orbit_noise_amp_w) - AM_RANGE(0x3a00, 0x3a00) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "discrete", orbit_note_amp_w) + AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x00ff) AM_DEVWRITE("discrete", orbit_note_w) + AM_RANGE(0x3900, 0x3900) AM_MIRROR(0x00ff) AM_DEVWRITE("discrete", orbit_noise_amp_w) + AM_RANGE(0x3a00, 0x3a00) AM_MIRROR(0x00ff) AM_DEVWRITE("discrete", orbit_note_amp_w) AM_RANGE(0x3c00, 0x3c0f) AM_MIRROR(0x00f0) AM_WRITE(orbit_misc_w) - AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "discrete", orbit_noise_rst_w) + AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00ff) AM_DEVWRITE("discrete", orbit_noise_rst_w) AM_RANGE(0x3f00, 0x3f00) AM_MIRROR(0x00ff) AM_WRITE(watchdog_reset_w) AM_RANGE(0x6000, 0x7fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index b041bdeb512..4fb3f2a6451 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -101,7 +101,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READ(othldrby_videoram_r) AM_RANGE(0x30000c, 0x30000d) AM_READ(pip) // vblank? AM_RANGE(0x400000, 0x400fff) AM_READ(SMH_RAM) - AM_RANGE(0x600000, 0x600001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x600000, 0x600001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x700000, 0x700001) AM_READ(pap) // scanline??? AM_RANGE(0x700004, 0x700005) AM_READ_PORT("DSW1") AM_RANGE(0x700008, 0x700009) AM_READ_PORT("DSW2") @@ -119,8 +119,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300008, 0x300009) AM_WRITE(othldrby_vreg_addr_w) AM_RANGE(0x30000c, 0x30000f) AM_WRITE(othldrby_vreg_w) AM_RANGE(0x400000, 0x400fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x600000, 0x600001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) - AM_RANGE(0x700030, 0x700031) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) + AM_RANGE(0x600000, 0x600001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) + AM_RANGE(0x700030, 0x700031) AM_DEVWRITE("oki", oki_bankswitch_w) AM_RANGE(0x700034, 0x700035) AM_WRITE(coinctrl_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index ca00baf4917..a765e09287c 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -475,20 +475,20 @@ static WRITE8_HANDLER( othunder_TC0310FAM_w ) because we are using the AY-3-8910 emulation. */ volr = (pan[0] + pan[2]) * 100 / (2 * 0x1f); voll = (pan[1] + pan[3]) * 100 / (2 * 0x1f); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "2610.0l"), voll / 100.0); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "2610.0r"), volr / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, "2610.0l"), voll / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, "2610.0r"), volr / 100.0); /* CH1 */ volr = pan[0] * 100 / 0x1f; voll = pan[1] * 100 / 0x1f; - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "2610.1l"), voll / 100.0); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "2610.1r"), volr / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, "2610.1l"), voll / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, "2610.1r"), volr / 100.0); /* CH2 */ volr = pan[2] * 100 / 0x1f; voll = pan[3] * 100 / 0x1f; - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "2610.2l"), voll / 100.0); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, "2610.2r"), volr / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, "2610.2l"), voll / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, "2610.2r"), volr / 100.0); } @@ -518,7 +518,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_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 */ diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 8cad73ebdbc..9aac976a7d8 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -247,8 +247,8 @@ static ADDRESS_MAP_START( overdriv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("INPUTS") AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("SYSTEM") AM_RANGE(0x180000, 0x180001) AM_READ_PORT("PADDLE") - AM_RANGE(0x1d8000, 0x1d8003) AM_DEVREAD8(SOUND, "konami1", overdriv_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x1e0000, 0x1e0003) AM_DEVREAD8(SOUND, "konami2", overdriv_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x1d8000, 0x1d8003) AM_DEVREAD8("konami1", overdriv_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x1e0000, 0x1e0003) AM_DEVREAD8("konami2", overdriv_sound_r, 0x00ff) /* K053260 */ AM_RANGE(0x200000, 0x203fff) AM_READ(sharedram_r) AM_RANGE(0x210000, 0x210fff) AM_READ(K051316_0_msb_r) AM_RANGE(0x218000, 0x218fff) AM_READ(K051316_1_msb_r) @@ -266,8 +266,8 @@ static ADDRESS_MAP_START( overdriv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(K051316_ctrl_0_msb_w) AM_RANGE(0x1c8000, 0x1c801f) AM_WRITE(K051316_ctrl_1_msb_w) AM_RANGE(0x1d0000, 0x1d001f) AM_WRITE(K053251_msb_w) - AM_RANGE(0x1d8000, 0x1d8003) AM_DEVWRITE8(SOUND, "konami1", k053260_w, 0x00ff) - AM_RANGE(0x1e0000, 0x1e0003) AM_DEVWRITE8(SOUND, "konami2", k053260_w, 0x00ff) + AM_RANGE(0x1d8000, 0x1d8003) AM_DEVWRITE8("konami1", k053260_w, 0x00ff) + AM_RANGE(0x1e0000, 0x1e0003) AM_DEVWRITE8("konami2", k053260_w, 0x00ff) AM_RANGE(0x1e8000, 0x1e8001) AM_WRITE(overdriv_soundirq_w) AM_RANGE(0x1f0000, 0x1f0001) AM_WRITE(cpuA_ctrl_w) /* halt cpu B, coin counter, start lamp, other? */ AM_RANGE(0x1f8000, 0x1f8001) AM_WRITE(eeprom_w) @@ -310,17 +310,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( overdriv_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0200, 0x0201) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x0400, 0x042f) AM_DEVREAD(SOUND, "konami1", k053260_r) - AM_RANGE(0x0600, 0x062f) AM_DEVREAD(SOUND, "konami2", k053260_r) + AM_RANGE(0x0200, 0x0201) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x0400, 0x042f) AM_DEVREAD("konami1", k053260_r) + AM_RANGE(0x0600, 0x062f) AM_DEVREAD("konami2", k053260_r) 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 ) - AM_RANGE(0x0200, 0x0201) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x0400, 0x042f) AM_DEVWRITE(SOUND, "konami1", k053260_w) - AM_RANGE(0x0600, 0x062f) AM_DEVWRITE(SOUND, "konami2", k053260_w) + AM_RANGE(0x0200, 0x0201) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x0400, 0x042f) AM_DEVWRITE("konami1", k053260_w) + AM_RANGE(0x0600, 0x062f) AM_DEVWRITE("konami2", k053260_w) 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 36e222ffc94..dcb3c471640 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -256,7 +256,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3a00, 0x3a01) AM_WRITE(pacland_scroll1_w) AM_RANGE(0x3c00, 0x3c00) AM_WRITE(pacland_bankswitch_w) AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) - AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */ + AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */ AM_RANGE(0x7000, 0x7fff) AM_WRITE(pacland_irq_1_ctrl_w) AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) @@ -267,7 +267,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x001f) AM_READWRITE(hd63701_internal_registers_r, hd63701_internal_registers_w) AM_RANGE(0x0080, 0x00ff) AM_RAM - AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r, namcos1_cus30_w) AM_BASE(&namco_wavedata) /* PSG device, shared RAM */ + AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", 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(SMH_ROM) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 54de49b883b..aad3dc9ec32 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -528,11 +528,11 @@ static WRITE8_HANDLER( alibaba_sound_w ) /* since the sound region in Ali Baba is not contiguous, translate the offset into the 0-0x1f range */ if (offset < 0x10) - pacman_sound_w(devtag_get_device(space->machine, SOUND, "namco"), offset, data); + pacman_sound_w(devtag_get_device(space->machine, "namco"), offset, data); else if (offset < 0x20) spriteram_2[offset - 0x10] = data; else - pacman_sound_w(devtag_get_device(space->machine, SOUND, "namco"), offset - 0x10, data); + pacman_sound_w(devtag_get_device(space->machine, "namco"), offset - 0x10, data); } @@ -897,13 +897,13 @@ static ADDRESS_MAP_START( pacman_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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) @@ -924,13 +924,13 @@ static ADDRESS_MAP_START( mspacman_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(SMH_NOP) // AM_WRITE(pacman_leds_w) 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, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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) @@ -964,13 +964,13 @@ static ADDRESS_MAP_START( woodpek_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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) @@ -999,7 +999,7 @@ static ADDRESS_MAP_START( alibaba_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", 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(SMH_NOP) @@ -1022,13 +1022,13 @@ static ADDRESS_MAP_START( dremshpr_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) +// AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) +// AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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) @@ -1049,13 +1049,13 @@ static ADDRESS_MAP_START( epos_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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) @@ -1132,10 +1132,10 @@ static ADDRESS_MAP_START( rocktrv2_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_DEVWRITE("namco", pacman_sound_enable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w) AM_RANGE(0x5007, 0x5007) AM_WRITE(pacman_coin_counter_w) - AM_RANGE(0x5040, 0x505f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5fe0, 0x5fe3) AM_WRITE(rocktrv2_prot_data_w) AM_BASE(&rocktrv2_prot_data) AM_RANGE(0x5ff0, 0x5ff0) AM_WRITE(rocktrv2_question_bank_w) @@ -1159,10 +1159,10 @@ static ADDRESS_MAP_START( bigbucks_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_DEVWRITE("namco", pacman_sound_enable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w) AM_RANGE(0x5007, 0x5007) AM_WRITE(SMH_NOP) /*?*/ - AM_RANGE(0x5040, 0x505f) AM_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x503f) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x5040, 0x507f) AM_READ_PORT("IN1") /* IN1 */ @@ -1182,13 +1182,13 @@ static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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) @@ -1209,7 +1209,7 @@ static ADDRESS_MAP_START( crushs_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) 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(SMH_NOP) // AM_WRITE(pacman_leds_w) @@ -1239,13 +1239,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vanvan_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "namco", sn76496_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("namco", sn76496_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn2", sn76496_w) ADDRESS_MAP_END static ADDRESS_MAP_START( dremshpr_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x06, 0x07) AM_DEVWRITE(SOUND, "namco", ay8910_data_address_w) + AM_RANGE(0x06, 0x07) AM_DEVWRITE("namco", ay8910_data_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( piranha_writeport, ADDRESS_SPACE_IO, 8 ) @@ -1296,7 +1296,7 @@ static ADDRESS_MAP_START( porky_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( s2650games_writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE(SOUND, "namco", sn76496_w) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE("namco", sn76496_w) ADDRESS_MAP_END static ADDRESS_MAP_START( crushs_readport, ADDRESS_SPACE_IO, 8 ) @@ -1307,7 +1307,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crushs_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "namco", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("namco", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index 6ce58765464..2a6a3ffc55b 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -166,14 +166,14 @@ static ADDRESS_MAP_START( pandoras_readmem_snd, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "ay", ay8910_r) /* AY-8910 */ + AM_RANGE(0x6001, 0x6001) AM_DEVREAD("ay", ay8910_r) /* AY-8910 */ ADDRESS_MAP_END static ADDRESS_MAP_START( pandoras_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) /* RAM */ - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w)/* AY-8910 */ - AM_RANGE(0x6002, 0x6002) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) /* AY-8910 */ + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay", ay8910_address_w)/* AY-8910 */ + AM_RANGE(0x6002, 0x6002) AM_DEVWRITE("ay", ay8910_data_w) /* AY-8910 */ AM_RANGE(0x8000, 0x8000) AM_WRITE(pandoras_i8039_irqtrigger_w)/* cause INT on the 8039 */ AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch2_w) /* sound command to the 8039 */ ADDRESS_MAP_END @@ -188,7 +188,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_and_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 733aa4883d4..6942f79a4e3 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -101,14 +101,14 @@ static ADDRESS_MAP_START( paradise_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x2001, 0x2001) AM_WRITE(paradise_flipscreen_w ) // Flip Screen AM_RANGE(0x2004, 0x2004) AM_WRITE(paradise_palbank_w ) // Layers palette bank AM_RANGE(0x2006, 0x2006) AM_WRITE(paradise_rombank_w ) // ROM bank - AM_RANGE(0x2007, 0x2007) AM_DEVWRITE(SOUND, "oki2", paradise_okibank_w ) // OKI 1 samples bank - AM_RANGE(0x2010, 0x2010) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) // OKI 0 + AM_RANGE(0x2007, 0x2007) AM_DEVWRITE("oki2", paradise_okibank_w ) // OKI 1 samples bank + AM_RANGE(0x2010, 0x2010) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) // OKI 0 AM_RANGE(0x2020, 0x2020) AM_READ_PORT("DSW1" ) AM_RANGE(0x2021, 0x2021) AM_READ_PORT("DSW2" ) AM_RANGE(0x2022, 0x2022) AM_READ_PORT("P1" ) AM_RANGE(0x2023, 0x2023) AM_READ_PORT("P2" ) AM_RANGE(0x2024, 0x2024) AM_READ_PORT("SYSTEM" ) - AM_RANGE(0x2030, 0x2030) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) // OKI 1 + AM_RANGE(0x2030, 0x2030) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) // OKI 1 AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w ) AM_BASE(&videoram) // Pixmap ADDRESS_MAP_END @@ -118,7 +118,7 @@ static ADDRESS_MAP_START( torus_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x2001, 0x2001) AM_WRITE(paradise_flipscreen_w ) // Flip Screen AM_RANGE(0x2004, 0x2004) AM_WRITE(paradise_palbank_w ) // Layers palette bank AM_RANGE(0x2006, 0x2006) AM_WRITE(paradise_rombank_w ) // ROM bank - AM_RANGE(0x2010, 0x2010) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) // OKI 0 + AM_RANGE(0x2010, 0x2010) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) // OKI 0 AM_RANGE(0x2020, 0x2020) AM_READ_PORT("DSW1" ) AM_RANGE(0x2021, 0x2021) AM_READ_PORT("DSW2" ) AM_RANGE(0x2022, 0x2022) AM_READ_PORT("P1" ) diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c index 90d290830ca..fd13f4c834f 100644 --- a/src/mame/drivers/paranoia.c +++ b/src/mame/drivers/paranoia.c @@ -59,7 +59,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8) AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram ) AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w ) AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w ) - AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( SOUND, "c6280", c6280_r, c6280_w ) + AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( "c6280", c6280_r, c6280_w ) AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( h6280_timer_r, h6280_timer_w ) AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w ) AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w ) diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 6bb8c80ddbc..0a548ca08bc 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -138,7 +138,7 @@ static ADDRESS_MAP_START( parodius_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3f90, 0x3f90) AM_READ_PORT("DSW2") AM_RANGE(0x3fa0, 0x3faf) AM_READ(K053244_r) AM_RANGE(0x3fc0, 0x3fc0) AM_READ(watchdog_reset_r) - AM_RANGE(0x3fcc, 0x3fcd) AM_DEVREAD(SOUND, "konami", parodius_sound_r) /* K053260 */ + AM_RANGE(0x3fcc, 0x3fcd) AM_DEVREAD("konami", 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(SMH_BANK1) /* banked ROM */ @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( parodius_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fc0, 0x3fc0) AM_WRITE(parodius_3fc0_w) AM_RANGE(0x3fc4, 0x3fc4) AM_WRITE(parodius_videobank_w) AM_RANGE(0x3fc8, 0x3fc8) AM_WRITE(parodius_sh_irqtrigger_w) - AM_RANGE(0x3fcc, 0x3fcd) AM_DEVWRITE(SOUND, "konami", k053260_w) + AM_RANGE(0x3fcc, 0x3fcd) AM_DEVWRITE("konami", k053260_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(SMH_ROM) /* banked ROM */ @@ -163,16 +163,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( parodius_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) - AM_RANGE(0xf800, 0xf801) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVREAD(SOUND, "konami", k053260_r) + AM_RANGE(0xf800, 0xf801) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVREAD("konami", k053260_r) ADDRESS_MAP_END static ADDRESS_MAP_START( parodius_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVWRITE(SOUND, "konami", k053260_w) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVWRITE("konami", k053260_w) ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 175f0976ea6..f1015641861 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -220,10 +220,10 @@ static ADDRESS_MAP_START( pasha2_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x80, 0x83) AM_READ_PORT("INPUTS") AM_RANGE(0xa0, 0xa3) AM_WRITENOP //soundlatch? AM_RANGE(0xc0, 0xc3) AM_WRITE(pasha2_misc_w) - AM_RANGE(0xe0, 0xe3) AM_DEVREADWRITE(SOUND, "oki1", oki_r, oki_w) - AM_RANGE(0xe4, 0xe7) AM_DEVREADWRITE(SOUND, "oki2", oki_r, oki_w) - AM_RANGE(0xe8, 0xeb) AM_DEVWRITE(SOUND, "oki1", oki_bank_w) - AM_RANGE(0xec, 0xef) AM_DEVWRITE(SOUND, "oki2", oki_bank_w) + AM_RANGE(0xe0, 0xe3) AM_DEVREADWRITE("oki1", oki_r, oki_w) + AM_RANGE(0xe4, 0xe7) AM_DEVREADWRITE("oki2", oki_r, oki_w) + AM_RANGE(0xe8, 0xeb) AM_DEVWRITE("oki1", oki_bank_w) + AM_RANGE(0xec, 0xef) AM_DEVWRITE("oki2", oki_bank_w) ADDRESS_MAP_END static INPUT_PORTS_START( pasha2 ) diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c index cb7e97a2522..57e5c960c93 100644 --- a/src/mame/drivers/pass.c +++ b/src/mame/drivers/pass.c @@ -157,8 +157,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pass_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index e529edcd15d..4c2538bfc88 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -68,15 +68,15 @@ static ADDRESS_MAP_START( pastelg_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) // AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_RANGE(0x90, 0x96) AM_WRITE(pastelg_blitter_w) AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r, nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r, pastelg_romsel_w) AM_RANGE(0xc0, 0xc0) AM_READ(pastelg_sndrom_r) AM_RANGE(0xc0, 0xcf) AM_WRITE(pastelg_clut_w) - AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE(SOUND, "dac", DAC_WRITE) // unknown + AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE("dac", DAC_WRITE) // unknown AM_RANGE(0xe0, 0xe0) AM_READ_PORT("DSWC") ADDRESS_MAP_END @@ -117,15 +117,15 @@ static WRITE8_HANDLER( threeds_inputportsel_w ) static ADDRESS_MAP_START( threeds_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x81, 0x81) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x82, 0x83) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x81, 0x81) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_WRITE( threeds_romsel_w ) AM_RANGE(0xf0, 0xf6) AM_WRITE(pastelg_blitter_w) AM_RANGE(0xa0, 0xa0) AM_READWRITE(threeds_inputport1_r, threeds_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READ(threeds_inputport2_r) AM_RANGE(0xc0, 0xcf) AM_WRITE(pastelg_clut_w) AM_RANGE(0xc0, 0xc0) AM_READ_PORT("DSWC") - AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE(SOUND, "dac", DAC_WRITE) // unknown + AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE("dac", DAC_WRITE) // unknown ADDRESS_MAP_END static INPUT_PORTS_START( pastelg ) diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 04584bf407a..cb66b332c80 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -138,9 +138,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x11) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x20, 0x21) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x30, 0x31) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x20, 0x21) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x30, 0x31) AM_DEVWRITE("ay3", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index d6cb0a658bd..2fb9e578e14 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -102,15 +102,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x3400, 0x3400) AM_DEVREAD(SOUND, "msm", pcktgal_adpcm_reset_r) /* ? not sure */ + AM_RANGE(0x3400, 0x3400) AM_DEVREAD("msm", pcktgal_adpcm_reset_r) /* ? not sure */ 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(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_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(SMH_ROM) diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 24d250ee42e..ed251b227e6 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -455,8 +455,8 @@ static READ8_DEVICE_HANDLER( port_c_r ) static WRITE8_DEVICE_HANDLER( port_b_w ) { port_b_data = data; -// const device_config *beep = devtag_get_device(device->machine, SOUND, "beep"); -// const device_config *cvsd = devtag_get_device(device->machine, SOUND, "cvsd"); +// const device_config *beep = devtag_get_device(device->machine, "beep"); +// const device_config *cvsd = devtag_get_device(device->machine, "cvsd"); // hc55516_digit_w(cvsd, data); // popmessage("%02x\n",data); // beep_set_state(beep, 0); @@ -666,14 +666,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( filetto_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3ff) - AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE(DMA8237, "dma8237_1", dma8237_r, dma8237_w ) //8237 DMA Controller - AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE(PIC8259, "pic8259_1", pic8259_r, pic8259_w ) //8259 Interrupt control - AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE(PIT8253, "pit8253", pit8253_r, pit8253_w) //8253 PIT - AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) //PPI 8255 - AM_RANGE(0x0064, 0x0066) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) //PPI 8255 + AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("dma8237_1", dma8237_r, dma8237_w ) //8237 DMA Controller + AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE("pic8259_1", pic8259_r, pic8259_w ) //8259 Interrupt control + AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE("pit8253", pit8253_r, pit8253_w) //8253 PIT + AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) //PPI 8255 + AM_RANGE(0x0064, 0x0066) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) //PPI 8255 AM_RANGE(0x0070, 0x007f) AM_READWRITE(mc146818_port_r,mc146818_port_w) AM_RANGE(0x0080, 0x0087) AM_READWRITE(dma_page_select_r,dma_page_select_w) - AM_RANGE(0x00a0, 0x00af) AM_DEVREADWRITE(PIC8259, "pic8259_2", pic8259_r, pic8259_w ) + AM_RANGE(0x00a0, 0x00af) AM_DEVREADWRITE("pic8259_2", pic8259_r, pic8259_w ) // AM_RANGE(0x0200, 0x020f) AM_RAM //game port AM_RANGE(0x0201, 0x0201) AM_READ_PORT("COIN") //game port AM_RANGE(0x0278, 0x027f) AM_RAM //printer (parallel) port latch @@ -695,14 +695,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tetriskr_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3ff) - AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE(DMA8237, "dma8237_1", dma8237_r, dma8237_w ) //8237 DMA Controller - AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE(PIC8259, "pic8259_1", pic8259_r, pic8259_w ) //8259 Interrupt control - AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE(PIT8253, "pit8253", pit8253_r, pit8253_w) //8253 PIT - AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) //PPI 8255 - AM_RANGE(0x0064, 0x0066) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) //PPI 8255 + AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("dma8237_1", dma8237_r, dma8237_w ) //8237 DMA Controller + AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE("pic8259_1", pic8259_r, pic8259_w ) //8259 Interrupt control + AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE("pit8253", pit8253_r, pit8253_w) //8253 PIT + AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) //PPI 8255 + AM_RANGE(0x0064, 0x0066) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) //PPI 8255 AM_RANGE(0x0070, 0x007f) AM_READWRITE(mc146818_port_r,mc146818_port_w) AM_RANGE(0x0080, 0x0087) AM_READWRITE(dma_page_select_r,dma_page_select_w) - AM_RANGE(0x00a0, 0x00af) AM_DEVREADWRITE(PIC8259, "pic8259_2", pic8259_r, pic8259_w ) + AM_RANGE(0x00a0, 0x00af) AM_DEVREADWRITE("pic8259_2", pic8259_r, pic8259_w ) AM_RANGE(0x0200, 0x020f) AM_RAM //game port // AM_RANGE(0x0201, 0x0201) AM_READ_PORT("IN1") //game port AM_RANGE(0x0278, 0x027f) AM_RAM //printer (parallel) port latch @@ -897,11 +897,11 @@ static MACHINE_RESET( filetto ) lastvalue = -1; hv_blank = 0; cpu_set_irq_callback(machine->cpu[0], irq_callback); - filetto_devices.pit8253 = device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ); - filetto_devices.pic8259_1 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_1" ); - filetto_devices.pic8259_2 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_2" ); - filetto_devices.dma8237_1 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_1" ); - filetto_devices.dma8237_2 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_2" ); + filetto_devices.pit8253 = devtag_get_device( machine, "pit8253" ); + filetto_devices.pic8259_1 = devtag_get_device( machine, "pic8259_1" ); + filetto_devices.pic8259_2 = devtag_get_device( machine, "pic8259_2" ); + filetto_devices.dma8237_1 = devtag_get_device( machine, "dma8237_1" ); + filetto_devices.dma8237_2 = devtag_get_device( machine, "dma8237_2" ); } static MACHINE_DRIVER_START( filetto ) diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index 19afc70e969..a9f02ba5133 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -102,12 +102,12 @@ static ADDRESS_MAP_START( pengo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x9000, 0x901f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) AM_RANGE(0x9020, 0x902f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_RANGE(0x9000, 0x903f) AM_READ_PORT("DSW1") AM_RANGE(0x9040, 0x907f) AM_READ_PORT("DSW0") AM_RANGE(0x9040, 0x9040) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x9041, 0x9041) AM_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x9041, 0x9041) AM_DEVWRITE("namco", 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(SMH_NOP) /* coin counters */ @@ -124,12 +124,12 @@ static ADDRESS_MAP_START( jrpacmbl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&pacman_soundregs) + AM_RANGE(0x9000, 0x901f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&pacman_soundregs) 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_PORT("DSW") AM_RANGE(0x9040, 0x9040) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x9041, 0x9041) AM_DEVWRITE(SOUND, "namco", pacman_sound_enable_w) + AM_RANGE(0x9041, 0x9041) AM_DEVWRITE("namco", 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, 0x9044) AM_WRITE(jrpacman_bgpriority_w) diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index e15f71feaa0..b28e0eaab4d 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -731,17 +731,17 @@ static ADDRESS_MAP_START( peplus_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READWRITE(peplus_cmos_r, peplus_cmos_w) AM_BASE(&cmos_ram) // CRT Controller - AM_RANGE(0x2008, 0x2008) AM_DEVWRITE(R6545_1, "crtc", peplus_crtc_mode_w) - AM_RANGE(0x2080, 0x2080) AM_DEVREADWRITE(R6545_1, "crtc", mc6845_status_r, mc6845_address_w) - AM_RANGE(0x2081, 0x2081) AM_DEVREADWRITE(R6545_1, "crtc", mc6845_register_r, mc6845_register_w) - AM_RANGE(0x2083, 0x2083) AM_DEVREADWRITE(R6545_1, "crtc", mc6845_register_r, peplus_crtc_display_w) + AM_RANGE(0x2008, 0x2008) AM_DEVWRITE("crtc", peplus_crtc_mode_w) + AM_RANGE(0x2080, 0x2080) AM_DEVREADWRITE("crtc", mc6845_status_r, mc6845_address_w) + AM_RANGE(0x2081, 0x2081) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0x2083, 0x2083) AM_DEVREADWRITE("crtc", mc6845_register_r, peplus_crtc_display_w) // Superboard Data AM_RANGE(0x3000, 0x3fff) AM_READWRITE(peplus_s3000_r, peplus_s3000_w) AM_BASE(&s3000_ram) // Sound and Dipswitches - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x4004, 0x4004) AM_READ_PORT("SW1")/* likely ay8910 input port, not direct */ AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x4004, 0x4004) AM_READ_PORT("SW1")/* likely ay8910 input port, not direct */ AM_DEVWRITE("ay", ay8910_data_w) // Superboard Data AM_RANGE(0x5000, 0x5fff) AM_READWRITE(peplus_s5000_r, peplus_s5000_w) AM_BASE(&s5000_ram) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index c06f39efe36..676f88f2b73 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -397,7 +397,7 @@ static WRITE16_HANDLER ( z80_reset_w ) if (PGMLOGERROR) logerror("Z80: reset %04x @ %04x (%06x)\n", data, mem_mask, cpu_get_pc(space->cpu)); if(data == 0x5050) { - devtag_reset(space->machine, SOUND, "ics"); + devtag_reset(space->machine, "ics"); cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_HALT, CLEAR_LINE); cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_RESET, PULSE_LINE); if(0) { @@ -702,7 +702,7 @@ static ADDRESS_MAP_START( z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE(SOUND, "ics", ics2115_r, ics2115_w) + AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE("ics", ics2115_r, ics2115_w) AM_RANGE(0x8100, 0x81ff) AM_READWRITE(soundlatch3_r, z80_l3_w) AM_RANGE(0x8200, 0x82ff) AM_READWRITE(soundlatch_r, soundlatch_w) AM_RANGE(0x8400, 0x84ff) AM_READWRITE(soundlatch2_r, soundlatch2_w) diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index d29ce230c14..e081975aa39 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -42,8 +42,8 @@ static ADDRESS_MAP_START( phoenix_memory_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", phoenix_sound_control_a_w) - AM_RANGE(0x6800, 0x6bff) AM_DEVWRITE(SOUND, "discrete", phoenix_sound_control_b_w) + AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE("discrete", phoenix_sound_control_a_w) + AM_RANGE(0x6800, 0x6bff) AM_DEVWRITE("discrete", phoenix_sound_control_b_w) AM_RANGE(0x7000, 0x73ff) AM_READ_PORT("IN0") /* IN0 or IN1 */ AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") /* DSW */ ADDRESS_MAP_END @@ -64,8 +64,8 @@ static ADDRESS_MAP_START( survival_memory_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x6900, 0x69ff) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x6800, 0x68ff) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x6900, 0x69ff) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) AM_RANGE(0x7000, 0x73ff) AM_READ(survival_input_port_0_r) /* IN0 or IN1 */ AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") /* DSW */ ADDRESS_MAP_END diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index 464b7ad3b00..3082748bcd0 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -104,7 +104,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_NOP) /* SN76496 data latch */ - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* trigger read */ + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn", sn76496_w) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( merlinmm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa100, 0xa100) AM_READ_PORT("IN2") AM_RANGE(0xa180, 0xa180) AM_READ_PORT("IN3") AM_RANGE(0xa200, 0xa200) AM_WRITE(SMH_NOP) /* SN76496 data latch */ - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* trigger read */ + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn", sn76496_w) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index f6e1d74eb77..ce1f2f030e1 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -265,13 +265,13 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_WRITE(sound_bankswitch_w) AM_RANGE(0x16, 0x16) AM_READ(sound_command_r) AM_RANGE(0x17, 0x17) AM_WRITE(pending_command_clear_w) - AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hatris_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_MIRROR(0x08) AM_DEVREADWRITE(SOUND, "ym", ym2608_r, ym2608_w) + AM_RANGE(0x00, 0x03) AM_MIRROR(0x08) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) AM_RANGE(0x04, 0x04) AM_READ(sound_command_r) AM_RANGE(0x05, 0x05) AM_READWRITE(pending_command_r, pending_command_clear_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 58b99ee051b..79c6df6fef9 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -219,8 +219,8 @@ static ADDRESS_MAP_START( cpu0_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x97ff) AM_RAM_WRITE(vram1_w) AM_BASE(&vram1) AM_RANGE(0x9800, 0xa7ff) AM_RAM_WRITE(vram2_w) AM_BASE(&vram2) - AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xb810, 0xb813) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xb830, 0xb830) AM_NOP AM_RANGE(0xb840, 0xb840) AM_NOP ADDRESS_MAP_END @@ -228,12 +228,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu1_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80CTC, "ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w) AM_RANGE(0x06, 0x07) AM_NOP ADDRESS_MAP_END @@ -302,7 +302,7 @@ static const z80ctc_interface ctc_intf = static const z80_daisy_chain daisy_chain_sound[] = { - { Z80CTC, "ctc" }, + { "ctc" }, { NULL } }; diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 3697a321143..6bef85cd5f4 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -135,7 +135,7 @@ static WRITE16_HANDLER( pirates_out_w ) eeprom_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE); /* bit 6 selects oki bank */ - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (data & 0x40) ? 0x40000 : 0x00000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (data & 0x40) ? 0x40000 : 0x00000); /* bit 7 used (function unknown) */ } @@ -185,7 +185,7 @@ static ADDRESS_MAP_START( pirates_readmem, ADDRESS_SPACE_PROGRAM, 16 ) // 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_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0xa00000, 0xa00001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) ADDRESS_MAP_END static ADDRESS_MAP_START( pirates_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -202,7 +202,7 @@ static ADDRESS_MAP_START( pirates_writemem, ADDRESS_SPACE_PROGRAM, 16 ) // 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(SMH_RAM) // more of tilemaps ? - AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) ADDRESS_MAP_END diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c index 6209f82dbb0..32b3067d919 100644 --- a/src/mame/drivers/pitnrun.c +++ b/src/mame/drivers/pitnrun.c @@ -131,9 +131,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0x8c, 0x8d) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8e, 0x8f) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8f, 0x8f) AM_DEVREAD(SOUND, "ay1", ay8910_r) + AM_RANGE(0x8c, 0x8d) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8e, 0x8f) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8f, 0x8f) AM_DEVREAD("ay1", ay8910_r) AM_RANGE(0x90, 0x96) AM_WRITE(SMH_NOP) AM_RANGE(0x97, 0x97) AM_WRITE(SMH_NOP) AM_RANGE(0x98, 0x98) AM_WRITE(SMH_NOP) diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 912dcb4e35b..c5f2ea259c2 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( pkscramble_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x049018, 0x049019) AM_WRITENOP AM_RANGE(0x04901c, 0x04901d) AM_WRITENOP AM_RANGE(0x049020, 0x049021) AM_WRITENOP - AM_RANGE(0x04900c, 0x04900f) AM_DEVREADWRITE8(SOUND, "ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x04900c, 0x04900f) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x052086, 0x052087) AM_WRITENOP ADDRESS_MAP_END diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index 47b24166848..95ff53fe8b8 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -88,13 +88,13 @@ static ADDRESS_MAP_START( pktgaldx_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x130000, 0x130fff) AM_RAM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0x140000, 0x14000f) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff) - AM_RANGE(0x140006, 0x140007) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff) - AM_RANGE(0x150000, 0x15000f) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff) - AM_RANGE(0x150006, 0x150007) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff) + AM_RANGE(0x140000, 0x14000f) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff) + AM_RANGE(0x140006, 0x140007) AM_DEVREAD8("oki1", okim6295_r, 0x00ff) + AM_RANGE(0x150000, 0x15000f) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff) + AM_RANGE(0x150006, 0x150007) AM_DEVREAD8("oki2", okim6295_r, 0x00ff) AM_RANGE(0x161800, 0x16180f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x164800, 0x164801) AM_DEVWRITE(SOUND, "oki2", pktgaldx_oki_bank_w) + AM_RANGE(0x164800, 0x164801) AM_DEVWRITE("oki2", 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 ADDRESS_MAP_END diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c index 9e14e78a500..8a98448bb9e 100644 --- a/src/mame/drivers/playch10.c +++ b/src/mame/drivers/playch10.c @@ -408,12 +408,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cart_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_MIRROR(0x1800) AM_BASE(&work_ram) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w) - AM_RANGE(0x4011, 0x4011) AM_DEVWRITE(SOUND, "dac", dac_w) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE(SOUND, "nes", nes_psg_r, nes_psg_w) + AM_RANGE(0x4011, 0x4011) AM_DEVWRITE("dac", dac_w) + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes", nes_psg_r, nes_psg_w) AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w) - AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE(SOUND, "nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE("nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */ AM_RANGE(0x4016, 0x4016) AM_READWRITE(pc10_in0_r, pc10_in0_w) - AM_RANGE(0x4017, 0x4017) AM_READ(pc10_in1_r) AM_DEVWRITE(SOUND, "nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4017, 0x4017) AM_READ(pc10_in1_r) AM_DEVWRITE("nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index b8ff95632dc..dee3b971fce 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -158,7 +158,7 @@ static READ8_HANDLER( playmark_snd_command_r ) // logerror("PortB reading %02x from the 68K\n",data); } else if ((playmark_oki_control & 0x38) == 0x28) { - data = (okim6295_r(devtag_get_device(space->machine, SOUND, "oki"),0) & 0x0f); + data = (okim6295_r(devtag_get_device(space->machine, "oki"),0) & 0x0f); // logerror("PortB reading %02x from the OKI status port\n",data); } @@ -341,9 +341,9 @@ ADDRESS_MAP_END /* $000 - 07F PIC16C57 Internal Data RAM */ static ADDRESS_MAP_START( playmark_sound_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "oki", playmark_oki_banking_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki", playmark_oki_banking_w) AM_RANGE(0x01, 0x01) AM_READWRITE(playmark_snd_command_r, playmark_oki_w) - AM_RANGE(0x02, 0x02) AM_READ(playmark_snd_flag_r) AM_DEVWRITE(SOUND, "oki", playmark_snd_control_w) + AM_RANGE(0x02, 0x02) AM_READ(playmark_snd_flag_r) AM_DEVWRITE("oki", playmark_snd_control_w) AM_RANGE(PIC16C5x_T0, PIC16C5x_T0) AM_READ(PIC16C5X_T0_clk_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index fd25c734463..f3212a717a2 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -584,9 +584,9 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_NOP) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE(SOUND, "konami1", k054539_r, k054539_w) + AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami1", k054539_r, k054539_w) AM_RANGE(0xe230, 0xe3ff) AM_RAM - AM_RANGE(0xe400, 0xe62f) AM_DEVREADWRITE(SOUND, "konami2", k054539_r, k054539_w) + AM_RANGE(0xe400, 0xe62f) AM_DEVREADWRITE("konami2", k054539_r, k054539_w) AM_RANGE(0xe630, 0xe7ff) AM_RAM AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index 488ae5e3e86..ff378816a48 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -145,7 +145,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) - AM_RANGE(0x2800, 0x2800) AM_DEVREAD(SOUND, "oki", okim6295_r) // extra + AM_RANGE(0x2800, 0x2800) AM_DEVREAD("oki", okim6295_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(SMH_BANK3) @@ -154,11 +154,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w) 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_DEVWRITE(SOUND, "oki", okim6295_w) // extra + AM_RANGE(0x2800, 0x2800) AM_DEVWRITE("oki", okim6295_w) // extra 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 10c1d680e98..435e6354bce 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -299,7 +299,7 @@ static WRITE8_HANDLER( polepos_latch_w ) break; case 0x02: /* CLSON */ - polepos_sound_enable(devtag_get_device(space->machine, SOUND, "namco"),bit); + polepos_sound_enable(devtag_get_device(space->machine, "namco"),bit); if (!bit) { polepos_engine_sound_lsb_w(space,0,0); @@ -409,7 +409,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", polepos_sound_w) AM_BASE(&polepos_soundregs)/* Sound data */ + AM_RANGE(0x83c0, 0x83ff) AM_DEVWRITE("namco", 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) AM_RANGE(0x9100, 0x9100) AM_READWRITE(namco_06xx_0_ctrl_r, namco_06xx_0_ctrl_w) diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 047e1728975..69c8ff89798 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -163,7 +163,7 @@ static WRITE32_HANDLER( control_w ) /* toggling BSMT off then on causes a reset */ if (!(old & 0x80000000) && (control_data & 0x80000000)) { - const device_config *device = devtag_get_device(space->machine, SOUND, "bsmt"); + const device_config *device = devtag_get_device(space->machine, "bsmt"); bsmt2000_data_w(device, bsmt_data_bank, 0, 0xffff); device_reset(device); } @@ -282,7 +282,7 @@ static ADDRESS_MAP_START( policetr_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00400000, 0x00400003) AM_READ(policetr_video_r) AM_RANGE(0x00500000, 0x00500003) AM_WRITENOP // copies ROM here at startup, plus checksum AM_RANGE(0x00600000, 0x00600003) AM_READ(bsmt2000_data_r) - AM_RANGE(0x00700000, 0x00700003) AM_DEVWRITE(SOUND, "bsmt", policetr_bsmt2000_reg_w) + AM_RANGE(0x00700000, 0x00700003) AM_DEVWRITE("bsmt", policetr_bsmt2000_reg_w) AM_RANGE(0x00800000, 0x00800003) AM_WRITE(policetr_bsmt2000_data_w) AM_RANGE(0x00900000, 0x00900003) AM_WRITE(policetr_palette_offset_w) AM_RANGE(0x00920000, 0x00920003) AM_WRITE(policetr_palette_data_w) @@ -303,7 +303,7 @@ static ADDRESS_MAP_START( sshooter_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00400000, 0x00400003) AM_READ(policetr_video_r) AM_RANGE(0x00500000, 0x00500003) AM_WRITENOP // copies ROM here at startup, plus checksum AM_RANGE(0x00600000, 0x00600003) AM_READ(bsmt2000_data_r) - AM_RANGE(0x00700000, 0x00700003) AM_DEVWRITE(SOUND, "bsmt", policetr_bsmt2000_reg_w) + AM_RANGE(0x00700000, 0x00700003) AM_DEVWRITE("bsmt", policetr_bsmt2000_reg_w) AM_RANGE(0x00800000, 0x0080000f) AM_WRITE(policetr_video_w) AM_RANGE(0x00a00000, 0x00a00003) AM_WRITE(control_w) AM_RANGE(0x00a00000, 0x00a00003) AM_READ_PORT("IN0") diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index eb6fd70c188..5e90cb102e6 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -105,12 +105,12 @@ static ADDRESS_MAP_START( poolshrk_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", poolshrk_scratch_sound_w) - AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x2000) AM_DEVWRITE(SOUND, "discrete", poolshrk_score_sound_w) - AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x2000) AM_DEVWRITE(SOUND, "discrete", poolshrk_click_sound_w) + AM_RANGE(0x1400, 0x17ff) AM_MIRROR(0x2000) AM_DEVWRITE("discrete", poolshrk_scratch_sound_w) + AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x2000) AM_DEVWRITE("discrete", poolshrk_score_sound_w) + AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x2000) AM_DEVWRITE("discrete", poolshrk_click_sound_w) AM_RANGE(0x4000, 0x4000) AM_NOP /* diagnostic ROM location */ AM_RANGE(0x6000, 0x63ff) AM_WRITE(poolshrk_da_latch_w) - AM_RANGE(0x6400, 0x67ff) AM_DEVWRITE(SOUND, "discrete", poolshrk_bump_sound_w) + AM_RANGE(0x6400, 0x67ff) AM_DEVWRITE("discrete", poolshrk_bump_sound_w) AM_RANGE(0x6800, 0x6bff) AM_READ(poolshrk_irq_reset_r) AM_RANGE(0x6c00, 0x6fff) AM_WRITE(poolshrk_led_w) AM_RANGE(0x7000, 0x7fff) AM_ROM diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index cf4d65d8173..25e4d947a24 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -147,11 +147,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0") - AM_RANGE(0x03, 0x03) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x03, 0x03) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index c7a474e5b06..9eb1465fded 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -199,9 +199,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( popper_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(SMH_NOP) //?? same writes as 0x8000 (mostly) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ay2", ay8910_address_data_w) 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/powerbal.c b/src/mame/drivers/powerbal.c index e74b64af3b8..983b19588ed 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -112,8 +112,8 @@ static ADDRESS_MAP_START( magicstk_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c2014, 0x0c2015) AM_READ_PORT("IN2") AM_WRITE(magicstk_coin_eeprom_w) AM_RANGE(0x0c2016, 0x0c2017) AM_READ_PORT("DSW1") AM_RANGE(0x0c2018, 0x0c2019) AM_READ_PORT("DSW2") - AM_RANGE(0x0c201c, 0x0c201d) AM_DEVWRITE(SOUND, "oki", oki_banking) - AM_RANGE(0x0c201e, 0x0c201f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x0c201c, 0x0c201d) AM_DEVWRITE("oki", oki_banking) + AM_RANGE(0x0c201e, 0x0c201f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0c4000, 0x0c4001) AM_WRITENOP AM_RANGE(0x0e0000, 0x0fffff) AM_RAM AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) @@ -132,8 +132,8 @@ static ADDRESS_MAP_START( powerbal_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c2014, 0x0c2015) AM_READ_PORT("IN2") AM_RANGE(0x0c2016, 0x0c2017) AM_READ_PORT("DSW1") AM_RANGE(0x0c2018, 0x0c2019) AM_READ_PORT("DSW2") - AM_RANGE(0x0c201c, 0x0c201d) AM_DEVWRITE(SOUND, "oki", oki_banking) - AM_RANGE(0x0c201e, 0x0c201f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x0c201c, 0x0c201d) AM_DEVWRITE("oki", oki_banking) + AM_RANGE(0x0c201e, 0x0c201f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x0c4000, 0x0c4001) AM_WRITENOP AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_RANGE(0x101000, 0x101fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c index 3dd847ded02..0f2b0ed889f 100644 --- a/src/mame/drivers/powerins.c +++ b/src/mame/drivers/powerins.c @@ -93,7 +93,7 @@ static ADDRESS_MAP_START( powerins_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2") AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1") AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2") - AM_RANGE(0x10003e, 0x10003f) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff) // OKI Status (used by powerina) + AM_RANGE(0x10003e, 0x10003f) AM_DEVREAD8("oki1", okim6295_r, 0x00ff) // OKI Status (used by powerina) 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 @@ -108,7 +108,7 @@ static ADDRESS_MAP_START( powerins_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff ) // used by powerina + AM_RANGE(0x10003e, 0x10003f) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff ) // used by powerina AM_RANGE(0x120000, 0x120fff) AM_WRITE(powerins_paletteram16_w) AM_BASE(&paletteram16 ) // Palette 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 @@ -136,9 +136,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( powerins_io_snd, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym2203", ym2203_r, ym2203_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x88, 0x88) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x88, 0x88) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x90, 0x97) AM_WRITE(NMK112_okibank_w) ADDRESS_MAP_END @@ -146,8 +146,8 @@ 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, SMH_NOP) AM_RANGE(0x01, 0x01) AM_NOP - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x88, 0x88) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x88, 0x88) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x90, 0x97) AM_WRITE(NMK112_okibank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 1bf203a098d..55c1cdac802 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -196,8 +196,8 @@ static WRITE8_HANDLER(ppmast_sound_w) switch(offset&0xff) { case 0: - case 1: ym2413_w(devtag_get_device(space->machine, SOUND, "ym"),offset,data); break; - case 2: dac_data_w(devtag_get_device(space->machine, SOUND, "dac"),data);break; + case 1: ym2413_w(devtag_get_device(space->machine, "ym"),offset,data); break; + case 2: dac_data_w(devtag_get_device(space->machine, "dac"),data);break; default: logerror("%x %x - %x\n",offset,data,cpu_get_previouspc(space->cpu)); } } diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index cbbf0539de7..f8b1d6dd84c 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -69,10 +69,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( prehisle_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "ym", ym3812_write_port_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "upd", D7759_write_port_0_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "upd", D7759_upd_reset_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", D7759_write_port_0_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", D7759_upd_reset_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 905d0d8fba6..4094532a616 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -68,10 +68,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x4000, 0x4fff) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x6000, 0x6fff) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) - AM_RANGE(0x7000, 0x7fff) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x4000, 0x4fff) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x6000, 0x6fff) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x7000, 0x7fff) AM_DEVWRITE("ay2", ay8910_address_w) // AM_RANGE(0x8000, 0x8fff) AM_WRITE(interrupt_enable_w) //??? AM_RANGE(0x9000, 0xafff) AM_READ(soundlatch_r) AM_RANGE(0xf000, 0xffff) AM_ROM diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 1b3b4b4df29..54985b25ee9 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -418,7 +418,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sngkace_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w ) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w ) AM_RANGE(0x04, 0x04) AM_WRITE(sngkace_sound_bankswitch_w ) AM_RANGE(0x08, 0x08) AM_READ(psikyo_soundlatch_r ) AM_RANGE(0x0c, 0x0c) AM_WRITE(psikyo_clear_nmi_w ) @@ -454,7 +454,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gunbird_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w ) - AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w ) + AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w ) AM_RANGE(0x08, 0x08) AM_READ(psikyo_soundlatch_r ) AM_RANGE(0x0c, 0x0c) AM_WRITE(psikyo_clear_nmi_w ) ADDRESS_MAP_END @@ -467,7 +467,7 @@ static ADDRESS_MAP_START( s1945_sound_io_map, 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(SMH_NOP ) - AM_RANGE(0x08, 0x0d) AM_DEVREADWRITE(SOUND, "ymf", ymf278b_r, ymf278b_w ) + AM_RANGE(0x08, 0x0d) AM_DEVREADWRITE("ymf", ymf278b_r, ymf278b_w ) AM_RANGE(0x10, 0x10) AM_READ(psikyo_soundlatch_r ) AM_RANGE(0x18, 0x18) AM_WRITE(psikyo_clear_nmi_w ) ADDRESS_MAP_END diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 0ae803c7fe7..7b8dd219ed3 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -399,7 +399,7 @@ static ADDRESS_MAP_START( ps4_readmem, ADDRESS_SPACE_PROGRAM, 32 ) 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_DEVREAD8(SOUND, "ymf", ymf278b_r, 0xffffffff) // read YMF status + AM_RANGE(0x05000000, 0x05000003) AM_DEVREAD8("ymf", ymf278b_r, 0xffffffff) // read YMF status AM_RANGE(0x05800000, 0x05800003) AM_READ_PORT("P1_P2") AM_RANGE(0x05800004, 0x05800007) AM_READ_PORT("P3_P4") AM_RANGE(0x06000000, 0x060fffff) AM_READ(SMH_RAM) // main RAM (1 meg) @@ -421,7 +421,7 @@ static ADDRESS_MAP_START( ps4_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03003ff8, 0x03003ffb) AM_WRITE(ps4_screen2_brt_w) // screen 2 brightness AM_RANGE(0x03003ffc, 0x03003fff) AM_WRITE(ps4_bgpen_2_dword_w) AM_BASE(&bgpen_2) // screen 2 clear colour AM_RANGE(0x03004000, 0x03005fff) AM_WRITE(ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w) AM_BASE(&paletteram32) // palette - AM_RANGE(0x05000000, 0x05000007) AM_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0xffffffff) + AM_RANGE(0x05000000, 0x05000007) AM_DEVWRITE8("ymf", ymf278b_w, 0xffffffff) 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 diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index f5a1ea6653d..41b717d8f7f 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -488,7 +488,7 @@ static ADDRESS_MAP_START( ps3v1_readmem, ADDRESS_SPACE_PROGRAM, 32 ) 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_DEVREAD8(SOUND, "ymf", ymf278b_r, 0xffffffff) // read YMF status + AM_RANGE(0x05000000, 0x05000003) AM_DEVREAD8("ymf", ymf278b_r, 0xffffffff) // read YMF status AM_RANGE(0x05800000, 0x05800003) AM_READ_PORT("INPUTS") AM_RANGE(0x05800004, 0x05800007) AM_READ(psh_eeprom_r) AM_RANGE(0x06000000, 0x060fffff) AM_READ(SMH_RAM) // main RAM (1 meg) @@ -509,7 +509,7 @@ static ADDRESS_MAP_START( ps3v1_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03050000, 0x030501ff) AM_WRITE(SMH_RAM) AM_BASE(&psikyosh_zoomram) // a gradient sometimes ... AM_RANGE(0x0305ffdc, 0x0305ffdf) AM_WRITE(psikyosh_irqctrl_w) AM_RANGE(0x0305ffe0, 0x0305ffff) AM_WRITE(psikyosh_vidregs_w) AM_BASE(&psikyosh_vidregs) // video registers - AM_RANGE(0x05000000, 0x05000007) AM_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0xffffffff) + AM_RANGE(0x05000000, 0x05000007) AM_DEVWRITE8("ymf", ymf278b_w, 0xffffffff) AM_RANGE(0x05800004, 0x05800007) AM_WRITE(psh_eeprom_w) AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(SMH_RAM) AM_BASE(&psh_ram) // work RAM ADDRESS_MAP_END @@ -518,7 +518,7 @@ static ADDRESS_MAP_START( ps5_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_READ(SMH_ROM) // program ROM (1 meg) AM_RANGE(0x03000000, 0x03000003) AM_READ_PORT("INPUTS") AM_RANGE(0x03000004, 0x03000007) AM_READ_PORT("JP4") - AM_RANGE(0x03100000, 0x03100003) AM_DEVREAD8(SOUND, "ymf", ymf278b_r, 0xffffffff) + AM_RANGE(0x03100000, 0x03100003) AM_DEVREAD8("ymf", ymf278b_r, 0xffffffff) 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) @@ -537,7 +537,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ps5_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(SMH_ROM) // program ROM (1 meg) AM_RANGE(0x03000004, 0x03000007) AM_WRITE(psh_eeprom_w) - AM_RANGE(0x03100000, 0x03100007) AM_DEVWRITE8(SOUND, "ymf", ymf278b_w, 0xffffffff) + AM_RANGE(0x03100000, 0x03100007) AM_DEVWRITE8("ymf", ymf278b_w, 0xffffffff) 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) diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 83221887c9e..4d1134e070a 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -448,8 +448,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( psychic5_soundport_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END @@ -481,8 +481,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bombsa_soundport_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index c478b35effe..c455a4cb8ca 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -312,8 +312,8 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_WRITE(nmi_sub_enable_w) AM_RANGE(0x4000, 0x4000) AM_RAM - AM_RANGE(0x5000, 0x5001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END static const gfx_layout charlayout = diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 63e844ee349..2dc63dd8045 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -133,8 +133,8 @@ static ADDRESS_MAP_START( puckpkmn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700014, 0x700015) AM_READ_PORT("UNK") AM_RANGE(0x700016, 0x700017) AM_READ_PORT("DSW1") AM_RANGE(0x700018, 0x700019) AM_READ_PORT("DSW2") - AM_RANGE(0x700022, 0x700023) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) /* M6295 Sound Chip Status Register */ - AM_RANGE(0xa04000, 0xa04003) AM_DEVREAD8(SOUND, "ym", ym3438_r, 0xffff) /* Ym3438 Sound Chip Status Register */ + AM_RANGE(0x700022, 0x700023) AM_DEVREAD8("oki", okim6295_r, 0x00ff) /* M6295 Sound Chip Status Register */ + AM_RANGE(0xa04000, 0xa04003) AM_DEVREAD8("ym", ym3438_r, 0xffff) /* Ym3438 Sound Chip Status Register */ AM_RANGE(0xc00000, 0xc0001f) AM_READ(genesis_vdp_r) /* VDP Access */ 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 */ @@ -148,8 +148,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( puckpkmn_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) /* Main 68k Program Roms */ - AM_RANGE(0x700022, 0x700023) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) /* M6295 Sound Chip Writes */ - AM_RANGE(0xa04000, 0xa04003) AM_DEVWRITE8(SOUND, "ym", ym3438_w, 0xffff) /* Ym3438 Sound Chip Writes */ + AM_RANGE(0x700022, 0x700023) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) /* M6295 Sound Chip Writes */ + AM_RANGE(0xa04000, 0xa04003) AM_DEVWRITE8("ym", ym3438_w, 0xffff) /* Ym3438 Sound Chip Writes */ AM_RANGE(0xc00000, 0xc0001f) AM_WRITE(genesis_vdp_w) /* VDP Access */ AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&main_ram) /* Main Ram */ diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index a78dbd1291d..3939dcaa5f7 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -145,7 +145,7 @@ DRIVER_INIT( armwrest ); static CUSTOM_INPUT( punchout_vlm5030_busy_r ) { /* bit 4 of DSW1 is busy pin level */ - return (vlm5030_bsy(devtag_get_device(field->port->machine, SOUND, "vlm"))) ? 0x00 : 0x01; + return (vlm5030_bsy(devtag_get_device(field->port->machine, "vlm"))) ? 0x00 : 0x01; } static WRITE8_DEVICE_HANDLER( punchout_speech_reset_w ) @@ -372,16 +372,16 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x01) AM_WRITE(SMH_NOP) /* the 2A03 #1 is not present */ AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW2") AM_WRITE(soundlatch_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(soundlatch2_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* VLM5030 */ + AM_RANGE(0x04, 0x04) AM_DEVWRITE("vlm", vlm5030_data_w) /* VLM5030 */ // AM_RANGE(0x05, 0x05) AM_WRITE(SMH_NOP) /* unused */ // AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) AM_RANGE(0x08, 0x08) AM_WRITE(interrupt_enable_w) 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_DEVWRITE(SOUND, "vlm", punchout_speech_reset_w) /* VLM5030 */ - AM_RANGE(0x0d, 0x0d) AM_DEVWRITE(SOUND, "vlm", punchout_speech_st_w) /* VLM5030 */ - AM_RANGE(0x0e, 0x0e) AM_DEVWRITE(SOUND, "vlm", punchout_speech_vcu_w) /* VLM5030 */ + AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("vlm", punchout_speech_reset_w) /* VLM5030 */ + AM_RANGE(0x0d, 0x0d) AM_DEVWRITE("vlm", punchout_speech_st_w) /* VLM5030 */ + AM_RANGE(0x0e, 0x0e) AM_DEVWRITE("vlm", punchout_speech_vcu_w) /* VLM5030 */ AM_RANGE(0x0f, 0x0f) AM_WRITE(SMH_NOP) /* enable NVRAM ? */ /* protection ports - Super Punchout only (move to install handler?) */ @@ -392,13 +392,13 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "nes", nes_psg_r) + AM_RANGE(0x4000, 0x4017) AM_DEVREAD("nes", nes_psg_r) 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(SMH_RAM) - AM_RANGE(0x4000, 0x4017) AM_DEVWRITE(SOUND, "nes", nes_psg_w) + AM_RANGE(0x4000, 0x4017) AM_DEVWRITE("nes", nes_psg_w) 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 fd5d3be8425..bbdc481f2e7 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -195,8 +195,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( bballs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index 9308d41fe1b..3abda84343c 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -85,7 +85,7 @@ static WRITE16_HANDLER( gp_control_w ) int vol = generic_nvram16[0x10] & 0xff; if (vol) { - const device_config *k054539 = devtag_get_device(space->machine, SOUND, "konami"); + const device_config *k054539 = devtag_get_device(space->machine, "konami"); int i; double gain = vol / 90.0; @@ -115,7 +115,7 @@ static WRITE16_HANDLER( gp2_control_w ) int vol = generic_nvram16[0x8] & 0xff; if (vol) { - const device_config *k054539 = devtag_get_device(space->machine, SOUND, "konami"); + const device_config *k054539 = devtag_get_device(space->machine, "konami"); int i; double gain = vol / 90.0; @@ -231,7 +231,7 @@ static WRITE16_DEVICE_HANDLER( ide_alt_w ) static READ16_HANDLER( gp2_ide_std_r ) { - const device_config *device = devtag_get_device(space->machine, IDE_CONTROLLER, "ide"); + const device_config *device = devtag_get_device(space->machine, "ide"); if (offset & 0x01) { if (offset == 0x07) @@ -335,12 +335,12 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x320000, 0x32001f) AM_READ(K053252_word_r) /* ccu */ AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service sw */ AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */ - AM_RANGE(0x800000, 0x80045f) AM_DEVREAD8(SOUND, "konami", k054539_r, 0x00ff) /* sound regs */ + AM_RANGE(0x800000, 0x80045f) AM_DEVREAD8("konami", k054539_r, 0x00ff) /* sound regs */ AM_RANGE(0x880000, 0x881fff) AM_READ(K056832_ram_word_r) /* vram */ AM_RANGE(0x882000, 0x883fff) AM_READ(K056832_ram_word_r) /* vram (mirror) */ AM_RANGE(0x900000, 0x901fff) AM_READ(v_rom_r) /* gfxrom through */ - AM_RANGE(0xa00000, 0xa0000f) AM_DEVREAD(IDE_CONTROLLER, "ide", ide_std_r) /* IDE control regs */ - AM_RANGE(0xa4000c, 0xa4000f) AM_DEVREAD(IDE_CONTROLLER, "ide", ide_alt_r) /* IDE status control reg */ + AM_RANGE(0xa00000, 0xa0000f) AM_DEVREAD("ide", ide_std_r) /* IDE control regs */ + AM_RANGE(0xa4000c, 0xa4000f) AM_DEVREAD("ide", ide_alt_r) /* IDE status control reg */ AM_RANGE(0xc00000, 0xcbffff) AM_READ(sndram_r) /* sound ram */ ADDRESS_MAP_END @@ -355,11 +355,11 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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(SMH_NOP) /* Watchdog */ - AM_RANGE(0x800000, 0x80045f) AM_DEVWRITE8(SOUND, "konami", k054539_w, 0x00ff) /* sound regs */ + AM_RANGE(0x800000, 0x80045f) AM_DEVWRITE8("konami", k054539_w, 0x00ff) /* 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) */ - AM_RANGE(0xa00000, 0xa0000f) AM_DEVWRITE(IDE_CONTROLLER, "ide", ide_std_w) /* IDE control regs */ - AM_RANGE(0xa4000c, 0xa4000f) AM_DEVWRITE(IDE_CONTROLLER, "ide", ide_alt_w) /* IDE status control reg */ + AM_RANGE(0xa00000, 0xa0000f) AM_DEVWRITE("ide", ide_std_w) /* IDE control regs */ + AM_RANGE(0xa4000c, 0xa4000f) AM_DEVWRITE("ide", ide_alt_w) /* IDE status control reg */ AM_RANGE(0xc00000, 0xcbffff) AM_WRITE(sndram_w) /* sound ram */ ADDRESS_MAP_END @@ -372,12 +372,12 @@ static ADDRESS_MAP_START( gp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x320000, 0x32001f) AM_READ(K053252_word_r) /* ccu */ AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service */ AM_RANGE(0x340000, 0x340001) AM_READ_PORT("340000") /* inputport */ - AM_RANGE(0x800000, 0x80045f) AM_DEVREAD8(SOUND, "konami", k054539_r, 0x00ff) /* sound regs */ + AM_RANGE(0x800000, 0x80045f) AM_DEVREAD8("konami", k054539_r, 0x00ff) /* sound regs */ AM_RANGE(0x880000, 0x881fff) AM_READ(gp2_vram_r) /* vram */ AM_RANGE(0x89f000, 0x8a0fff) AM_READ(gp2_vram_mirror_r) /* vram (mirror) */ AM_RANGE(0x900000, 0x901fff) AM_READ(v_rom_r) /* gfxrom through */ AM_RANGE(0xa00000, 0xa0000f) AM_READ(gp2_ide_std_r) /* IDE control regs */ - AM_RANGE(0xa4000c, 0xa4000f) AM_DEVREAD(IDE_CONTROLLER, "ide", ide_alt_r) /* IDE status control reg */ + AM_RANGE(0xa4000c, 0xa4000f) AM_DEVREAD("ide", ide_alt_r) /* IDE status control reg */ AM_RANGE(0xc00000, 0xcbffff) AM_READ(sndram_r) /* sound ram */ ADDRESS_MAP_END @@ -392,11 +392,11 @@ static ADDRESS_MAP_START( gp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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(SMH_NOP) /* Watchdog */ - AM_RANGE(0x800000, 0x80045f) AM_DEVWRITE8(SOUND, "konami", k054539_w, 0x00ff) /* sound regs */ + AM_RANGE(0x800000, 0x80045f) AM_DEVWRITE8("konami", k054539_w, 0x00ff) /* sound regs */ AM_RANGE(0x880000, 0x881fff) AM_WRITE(gp2_vram_w) /* vram */ AM_RANGE(0x89f000, 0x8a0fff) AM_WRITE(gp2_vram_mirror_w) /* vram (mirror) */ - AM_RANGE(0xa00000, 0xa0000f) AM_DEVWRITE(IDE_CONTROLLER, "ide", ide_std_w) /* IDE control regs */ - AM_RANGE(0xa4000c, 0xa4000f) AM_DEVWRITE(IDE_CONTROLLER, "ide", ide_alt_w) /* IDE status control reg */ + AM_RANGE(0xa00000, 0xa0000f) AM_DEVWRITE("ide", ide_std_w) /* IDE control regs */ + AM_RANGE(0xa4000c, 0xa4000f) AM_DEVWRITE("ide", ide_alt_w) /* IDE status control reg */ AM_RANGE(0xc00000, 0xcbffff) AM_WRITE(sndram_w) /* sound ram */ ADDRESS_MAP_END @@ -620,7 +620,7 @@ static MACHINE_RESET( qdrmfgp ) /* reset the IDE controller */ gp2_irq_control = 0; - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } static MACHINE_RESET( qdrmfgp2 ) @@ -632,7 +632,7 @@ static MACHINE_RESET( qdrmfgp2 ) /* reset the IDE controller */ gp2_irq_control = 0; - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index 87e54dcd558..cc6a7a91209 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -243,10 +243,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREADWRITE(PIA6821, "sndpia0", pia_r, pia_w) - AM_RANGE(0x9400, 0x97ff) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, qix_pia_w) - AM_RANGE(0x9800, 0x9bff) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x9c00, 0x9fff) AM_DEVREADWRITE(PIA6821, "pia2", pia_r, pia_w) + AM_RANGE(0x9000, 0x93ff) AM_DEVREADWRITE("sndpia0", pia_r, pia_w) + AM_RANGE(0x9400, 0x97ff) AM_DEVREADWRITE("pia0", pia_r, qix_pia_w) + AM_RANGE(0x9800, 0x9bff) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x9c00, 0x9fff) AM_DEVREADWRITE("pia2", pia_r, pia_w) AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -257,10 +257,10 @@ static ADDRESS_MAP_START( zoo_main_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREADWRITE(PIA6821, "sndpia0", pia_r, pia_w) - AM_RANGE(0x1400, 0x17ff) AM_DEVREADWRITE(PIA6821, "pia0", pia_r, qix_pia_w) - AM_RANGE(0x1800, 0x1bff) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0x1c00, 0x1fff) AM_DEVREADWRITE(PIA6821, "pia2", pia_r, pia_w) + AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("sndpia0", pia_r, pia_w) + AM_RANGE(0x1400, 0x17ff) AM_DEVREADWRITE("pia0", pia_r, qix_pia_w) + AM_RANGE(0x1800, 0x1bff) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0x1c00, 0x1fff) AM_DEVREADWRITE("pia2", pia_r, pia_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index 5aaaee38e60..f811fbc048a 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -116,8 +116,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x013fff) AM_ROM AM_RANGE(0x018000, 0x01cfff) AM_RAM AM_RANGE(0x800000, 0x801fff) AM_RAM AM_BASE(&quantum_vectorram) AM_SIZE(&vectorram_size) - AM_RANGE(0x840000, 0x84001f) AM_DEVREADWRITE8(SOUND, "pokey1", pokey_r, pokey_w, 0x00ff) - AM_RANGE(0x840020, 0x84003f) AM_DEVREADWRITE8(SOUND, "pokey2", pokey_r, pokey_w, 0x00ff) + AM_RANGE(0x840000, 0x84001f) AM_DEVREADWRITE8("pokey1", pokey_r, pokey_w, 0x00ff) + AM_RANGE(0x840020, 0x84003f) AM_DEVREADWRITE8("pokey2", pokey_r, pokey_w, 0x00ff) 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_PORT("SYSTEM") diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index cf10a226825..d566044cb39 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -185,7 +185,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x7f) AM_RAM AM_RANGE(0x80, 0x80) AM_READ(quasar_sh_command_r) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(audio_t1_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_signed_w) ADDRESS_MAP_END /************************************************************************ diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index cfc2374bfcb..864560162cd 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -78,8 +78,8 @@ static ADDRESS_MAP_START( quizdna_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE") AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) - AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( gakupara_io_map, ADDRESS_SPACE_IO, 8 ) @@ -93,8 +93,8 @@ static ADDRESS_MAP_START( gakupara_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE") AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) - AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( gekiretu_io_map, ADDRESS_SPACE_IO, 8 ) @@ -108,8 +108,8 @@ static ADDRESS_MAP_START( gekiretu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE") AM_RANGE(0xc0, 0xc0) AM_WRITE(gekiretu_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) - AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 4ae3b0e3675..225d77234c7 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x10, 0x10) AM_READ_PORT("IN1") AM_RANGE(0x40, 0x40) AM_READ_PORT("IN2") - AM_RANGE(0x50, 0x51) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x50, 0x51) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x60, 0x60) AM_WRITE(port60_w) AM_RANGE(0x70, 0x70) AM_WRITE(port70_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index 78e63e1cefd..857e85e35a0 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -53,7 +53,7 @@ static ADDRESS_MAP_START( quizpani_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2") AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1") AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2") - AM_RANGE(0x104000, 0x104001) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x104000, 0x104001) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x108000, 0x1083ff) AM_READ(SMH_RAM) AM_RANGE(0x110000, 0x113fff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18ffff) AM_READ(SMH_RAM) @@ -65,7 +65,7 @@ static ADDRESS_MAP_START( quizpani_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x104000, 0x104001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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(SMH_NOP) diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 50abdb17771..b2741e1fc18 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -327,7 +327,7 @@ static ADDRESS_MAP_START( quizpun2_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x00, 0x00 ) AM_WRITE( SMH_NOP ) // IRQ end AM_RANGE( 0x20, 0x20 ) AM_WRITE( SMH_NOP ) // NMI end AM_RANGE( 0x40, 0x40 ) AM_READ( soundlatch_r ) - AM_RANGE( 0x60, 0x61 ) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w ) + AM_RANGE( 0x60, 0x61 ) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w ) ADDRESS_MAP_END diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index 176c70828ba..7d51d43ae94 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -73,8 +73,8 @@ static WRITE_LINE_DEVICE_HANDLER( flipscreen_w ); static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - const device_config *pia0 = devtag_get_device(device->machine, PIA6821, "pia_main"); - const device_config *pia1 = devtag_get_device(device->machine, PIA6821, "pia_audio"); + const device_config *pia0 = devtag_get_device(device->machine, "pia_main"); + const device_config *pia1 = devtag_get_device(device->machine, "pia_audio"); int combined_state = pianew_get_irq_a(pia0) | pianew_get_irq_b(pia0) | pianew_get_irq_a(pia1) | pianew_get_irq_b(pia1); @@ -150,10 +150,10 @@ static READ8_DEVICE_HANDLER( AY8910_port_r ) UINT8 ret = 0; if (AY8910_selected & 0x08) - ret = ay8910_r(devtag_get_device(device->machine, SOUND, "ay1"), 0); + ret = ay8910_r(devtag_get_device(device->machine, "ay1"), 0); if (AY8910_selected & 0x10) - ret = ay8910_r(devtag_get_device(device->machine, SOUND, "ay2"), 0); + ret = ay8910_r(devtag_get_device(device->machine, "ay2"), 0); return ret; } @@ -162,10 +162,10 @@ static READ8_DEVICE_HANDLER( AY8910_port_r ) static WRITE8_DEVICE_HANDLER( AY8910_port_w ) { if (AY8910_selected & 0x08) - ay8910_data_address_w(devtag_get_device(device->machine, SOUND, "ay1"), AY8910_selected >> 2, data); + ay8910_data_address_w(devtag_get_device(device->machine, "ay1"), AY8910_selected >> 2, data); if (AY8910_selected & 0x10) - ay8910_data_address_w(devtag_get_device(device->machine, SOUND, "ay2"), AY8910_selected >> 2, data); + ay8910_data_address_w(devtag_get_device(device->machine, "ay2"), AY8910_selected >> 2, data); } @@ -206,7 +206,7 @@ static const ay8910_interface ay8910_2_interface = static WRITE8_DEVICE_HANDLER( ttl74123_output_changed ) { - const device_config *pia = devtag_get_device(device->machine, PIA6821, "pia_main"); + const device_config *pia = devtag_get_device(device->machine, "pia_main"); pia_ca1_w(pia, 0, data); ttl74123_output = data; } @@ -362,7 +362,7 @@ static MC6845_UPDATE_ROW( update_row ) static MC6845_ON_DE_CHANGED( display_enable_changed ) { - ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "74123"), 0, display_enabled); + ttl74123_a_w(devtag_get_device(device->machine, "74123"), 0, display_enabled); } @@ -381,7 +381,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( r2dtank ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = devtag_get_device(screen->machine, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; @@ -406,10 +406,10 @@ static ADDRESS_MAP_START( r2dtank_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x3fff) AM_RAM AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&r2dtank_colorram) AM_RANGE(0x6000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE(PIA6821, "pia_main", pia_r, pia_comp_w) + AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE("pia_main", pia_r, pia_comp_w) AM_RANGE(0x8004, 0x8004) AM_READWRITE(audio_answer_r, audio_command_w) - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xb001, 0xb001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xc000, 0xc007) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xc800, 0xffff) AM_ROM ADDRESS_MAP_END @@ -417,7 +417,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( r2dtank_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ - AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE(PIA6821, "pia_audio", pia_r, pia_w) + AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE("pia_audio", pia_r, pia_w) AM_RANGE(0xf000, 0xf000) AM_READWRITE(audio_command_r, audio_answer_w) AM_RANGE(0xf800, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 5c51c3c37c8..ad1489e2328 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -2041,7 +2041,7 @@ static ADDRESS_MAP_START( rdx_v33_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00762, 0x00763) AM_READ(rdx_v33_unknown2_r) - AM_RANGE(0x00780, 0x00781) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) // single OKI chip on this version + AM_RANGE(0x00780, 0x00781) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // single OKI chip on this version AM_RANGE(0x00800, 0x0087f) AM_RAM // copies eeprom here? AM_RANGE(0x00880, 0x0bfff) AM_RAM diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 065d0c07605..89ab3ca91f5 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -362,7 +362,7 @@ static ADDRESS_MAP_START( rainbow_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0x9000, 0x9001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -370,7 +370,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rainbow_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) ADDRESS_MAP_END @@ -378,8 +378,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) - AM_RANGE(0xb000, 0xb001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xb400, 0xb401) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xb000, 0xb001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xb400, 0xb401) AM_DEVREAD("ym2", ym2203_r) AM_RANGE(0xb800, 0xb800) AM_READ(jumping_latch_r) AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -387,8 +387,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0xb000, 0xb001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xb400, 0xb401) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xb400, 0xb401) AM_DEVWRITE("ym2", ym2203_w) 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 921dd809000..f9f3e67afb7 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -221,7 +221,7 @@ static WRITE8_HANDLER( rallyx_interrupt_vector_w ) static WRITE8_HANDLER( rallyx_bang_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); static int last; if (data == 0 && last != 0) @@ -249,7 +249,7 @@ static WRITE8_HANDLER( rallyx_latch_w ) case 0x02: /* SOUND ON */ /* this doesn't work in New Rally X so I'm not supporting it */ -// pacman_sound_enable_w(devtag_get_device(space->machine, SOUND, "namco"),bit); +// pacman_sound_enable_w(devtag_get_device(space->machine, "namco"),bit); break; case 0x03: /* FLIP */ @@ -325,7 +325,7 @@ static ADDRESS_MAP_START( rallyx_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa100, 0xa100) AM_READ_PORT("DSW") 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_DEVWRITE(SOUND, "namco", pacman_sound_w) AM_BASE(&namco_soundregs) + AM_RANGE(0xa100, 0xa11f) AM_DEVWRITE("namco", 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(SMH_NOP) /* ? */ diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index dff24d7ff76..0fb5be3e40b 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -108,10 +108,10 @@ static WRITE16_HANDLER( latch_w ) { atarigen_set_oki6295_vol(space->machine, (data & 0x0020) ? 100 : 0); if (!(data & 0x0010)) - devtag_reset(space->machine, SOUND, "oki"); + devtag_reset(space->machine, "oki"); atarigen_set_ym2413_vol(space->machine, ((data >> 1) & 7) * 100 / 7); if (!(data & 0x0001)) - devtag_reset(space->machine, SOUND, "ym"); + devtag_reset(space->machine, "ym"); } } @@ -135,8 +135,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3e0800, 0x3e3f3f) AM_MIRROR(0x010000) AM_RAM AM_RANGE(0x3e3f40, 0x3e3f7f) AM_MIRROR(0x010000) AM_RAM_WRITE(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_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0xff00) - AM_RANGE(0x480000, 0x480003) AM_MIRROR(0x019ffc) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0xff00) + AM_RANGE(0x460000, 0x460001) AM_MIRROR(0x019ffe) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) + AM_RANGE(0x480000, 0x480003) AM_MIRROR(0x019ffc) AM_DEVWRITE8("ym", ym2413_w, 0xff00) AM_RANGE(0x500000, 0x500fff) AM_MIRROR(0x019000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) AM_RANGE(0x5a6000, 0x5a6001) AM_MIRROR(0x019ffe) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x640000, 0x640001) AM_MIRROR(0x019ffe) AM_WRITE(latch_w) diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index f57e9690561..e48a2f2ec7c 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -248,12 +248,12 @@ static ADDRESS_MAP_START( rastan_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) 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(rastan_msm5205_address_w) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "msm", rastan_msm5205_start_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "msm", rastan_msm5205_stop_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("msm", rastan_msm5205_start_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("msm", rastan_msm5205_stop_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c index 5c4743482a5..6af0ccbc98a 100644 --- a/src/mame/drivers/rcasino.c +++ b/src/mame/drivers/rcasino.c @@ -178,8 +178,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rcasino_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("IN0") AM_WRITE(rcasino_port_10_w) // AM_RANGE(0x11, 0x11) AM_READ_PORT("IN1") AM_WRITE(rcasino_port_11_w) AM_RANGE(0x11, 0x11) AM_READWRITE(rcasino_port_11_r, rcasino_port_11_w) diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c index 6eb42eaac8a..bd8d24dd2b8 100644 --- a/src/mame/drivers/re900.c +++ b/src/mame/drivers/re900.c @@ -212,8 +212,8 @@ static ADDRESS_MAP_START( mem_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xe000, 0xe000) AM_WRITE(TMS9928A_vram_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(TMS9928A_register_w) - AM_RANGE(0xe800, 0xe801) AM_DEVWRITE(SOUND, "ay_re900", ay8910_address_data_w) - AM_RANGE(0xe802, 0xe802) AM_DEVREAD(SOUND, "ay_re900", ay8910_r) + AM_RANGE(0xe800, 0xe801) AM_DEVWRITE("ay_re900", ay8910_address_data_w) + AM_RANGE(0xe802, 0xe802) AM_DEVREAD("ay_re900", ay8910_r) AM_RANGE(0xe000, 0xefff) AM_WRITE(re900_watchdog_reset_w) AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_WRITE(cpu_port_0_w) AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_NOP diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index fea5f37653c..b2cb88fb950 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -164,14 +164,14 @@ static ADDRESS_MAP_START( base_mem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x800003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0xff00) // YMZ280 + AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0xff00) // YMZ280 AM_RANGE(0xfe0000, 0xfeffff) AM_RAM // RAM AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE(SMH_RAM,tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers ADDRESS_MAP_END /*realbrk specific memory map*/ static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) // + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs) AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select @@ -181,14 +181,14 @@ ADDRESS_MAP_END /*pkgnsh specific memory map*/ static ADDRESS_MAP_START( pkgnsh_mem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0xff00 ) // YM2413 + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0xff00 ) // YM2413 AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnsh_input_r ) // P1 & P2 (Inputs) AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_r,backup_ram_w) AM_BASE(&backup_ram) // RAM ADDRESS_MAP_END /*pkgnshdx specific memory map*/ static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16) - AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) // + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnshdx_input_r ) // P1 & P2 (Inputs) 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 @@ -198,7 +198,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x80000b) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) // + AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) // AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs) AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index f70cc4ee9aa..24bdec1ea1e 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -81,7 +81,7 @@ static MACHINE_RESET( relief ) atarigen_interrupt_reset(update_interrupts); atarivc_reset(machine->primary_screen, atarivc_eof_data, 2); - okim6295_set_bank_base(devtag_get_device(machine, SOUND, "oki"), 0); + okim6295_set_bank_base(devtag_get_device(machine, "oki"), 0); ym2413_volume = 15; overall_volume = 127; adpcm_bank_base = 0; @@ -122,7 +122,7 @@ static WRITE16_HANDLER( audio_control_w ) if (ACCESSING_BITS_8_15) adpcm_bank_base = (0x100000 * ((data >> 8) & 1)) | (adpcm_bank_base & 0x0c0000); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), adpcm_bank_base); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), adpcm_bank_base); } @@ -148,8 +148,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x3fffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x140000, 0x140003) AM_DEVWRITE8(SOUND, "ym", ym2413_w, 0x00ff) - AM_RANGE(0x140010, 0x140011) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x140000, 0x140003) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) + AM_RANGE(0x140010, 0x140011) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x140020, 0x140021) AM_WRITE(audio_volume_w) AM_RANGE(0x140030, 0x140031) AM_WRITE(audio_control_w) AM_RANGE(0x180000, 0x180fff) AM_READWRITE(atarigen_eeprom_upper_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index 3d2572e2b03..68ae000c29e 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -569,7 +569,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) - AM_RANGE(0x2800, 0x2801) AM_DEVREAD(SOUND, "ym", ym3526_r) + AM_RANGE(0x2800, 0x2801) AM_DEVREAD("ym", ym3526_r) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -577,7 +577,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x2801) AM_DEVWRITE(SOUND, "ym", ym3526_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ym", ym3526_w) 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 7e10a5a04b7..c46f3bddbd3 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -143,8 +143,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) AM_RANGE(0x6000, 0x6000) AM_WRITE(cpu2_m6000_w) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0xe000, 0xffff) AM_ROM /* space for diagnostic ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 814e3070a62..5c18ce768ab 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -203,9 +203,9 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r) AM_RANGE(0x8000, 0x8000) AM_READWRITE(keyboard_r, SMH_NOP) // ?? AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, keyboard_w) // ?? - AM_RANGE(0x8020, 0x8020) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x8020, 0x8021) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x8040, 0x8040) AM_DEVWRITE(SOUND, "msm", adpcm_w) + AM_RANGE(0x8020, 0x8020) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x8020, 0x8021) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8040, 0x8040) AM_DEVWRITE("msm", adpcm_w) AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w) AM_RANGE(0x8080, 0x8080) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0xbc04, 0xbc04) AM_WRITE(SMH_NOP) // ?? @@ -216,9 +216,9 @@ static ADDRESS_MAP_START( themj_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r) AM_RANGE(0x8000, 0x8000) AM_READWRITE(keyboard_r, SMH_NOP) // ?? AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, keyboard_w) // ?? - AM_RANGE(0x8020, 0x8020) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x8020, 0x8021) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x8040, 0x8040) AM_DEVWRITE(SOUND, "msm", adpcm_w) + AM_RANGE(0x8020, 0x8020) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x8020, 0x8021) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x8040, 0x8040) AM_DEVWRITE("msm", adpcm_w) AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w) AM_RANGE(0x8080, 0x8080) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x80a0, 0x80a0) AM_WRITE(themj_rombank_w) diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c index 3d6ecc839de..9c880b68177 100644 --- a/src/mame/drivers/rockola.c +++ b/src/mame/drivers/rockola.c @@ -329,8 +329,8 @@ static ADDRESS_MAP_START( sasuke_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(rockola_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(rockola_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(rockola_charram_w) AM_BASE(&rockola_charram) - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x4000, 0x8fff) AM_ROM AM_RANGE(0xb000, 0xb001) AM_WRITE(sasuke_sound_w) AM_RANGE(0xb002, 0xb002) AM_WRITE(satansat_b002_w) /* flip screen & irq enable */ @@ -348,8 +348,8 @@ static ADDRESS_MAP_START( satansat_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(rockola_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(rockola_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(rockola_charram_w) AM_BASE(&rockola_charram) - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x4000, 0x97ff) AM_ROM AM_RANGE(0xb000, 0xb001) AM_WRITE(satansat_sound_w) AM_RANGE(0xb002, 0xb002) AM_WRITE(satansat_b002_w) /* flip screen & irq enable */ @@ -367,8 +367,8 @@ static ADDRESS_MAP_START( vanguard_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(rockola_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(rockola_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(rockola_charram_w) AM_BASE(&rockola_charram) - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x3001, 0x3001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x3100, 0x3102) AM_WRITE(vanguard_sound_w) AM_RANGE(0x3103, 0x3103) AM_WRITE(rockola_flipscreen_w) AM_RANGE(0x3104, 0x3104) AM_READ_PORT("IN0") @@ -388,8 +388,8 @@ static ADDRESS_MAP_START( fantasy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(rockola_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(rockola_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(rockola_charram_w) AM_BASE(&rockola_charram) - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0x2001, 0x2001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0x2001, 0x2001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x2100, 0x2103) AM_WRITE(fantasy_sound_w) AM_RANGE(0x2104, 0x2104) AM_READ_PORT("IN0") AM_RANGE(0x2105, 0x2105) AM_READ_PORT("IN1") @@ -409,8 +409,8 @@ static ADDRESS_MAP_START( pballoon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(rockola_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(rockola_charram_w) AM_BASE(&rockola_charram) AM_RANGE(0x3000, 0x9fff) AM_ROM - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xb001, 0xb001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xb100, 0xb103) AM_WRITE(fantasy_sound_w) AM_RANGE(0xb104, 0xb104) AM_READ_PORT("IN0") AM_RANGE(0xb105, 0xb105) AM_READ_PORT("IN1") diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index c9c953237e5..9431dae6afa 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -131,17 +131,17 @@ static ADDRESS_MAP_START( rockrage_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rockrage_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x3000, 0x3000) AM_DEVREAD(SOUND, "vlm", rockrage_VLM5030_busy_r)/* VLM5030 */ + AM_RANGE(0x3000, 0x3000) AM_DEVREAD("vlm", rockrage_VLM5030_busy_r)/* VLM5030 */ AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) /* soundlatch_r */ - AM_RANGE(0x6000, 0x6001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM 2151 */ + AM_RANGE(0x6000, 0x6001) AM_DEVREAD("ym", ym2151_r) /* YM 2151 */ 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 ) - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* VLM5030 */ - AM_RANGE(0x4000, 0x4000) AM_DEVWRITE(SOUND, "vlm", rockrage_speech_w) /* VLM5030 */ - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM 2151 */ + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("vlm", vlm5030_data_w) /* VLM5030 */ + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("vlm", rockrage_speech_w) /* VLM5030 */ + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ym", ym2151_w) /* YM 2151 */ 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/rohga.c b/src/mame/drivers/rohga.c index 37ff8b7467a..9f1869510ef 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -325,9 +325,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki1", okim6295_r) - AM_RANGE(0x130000, 0x130001) AM_DEVREAD(SOUND, "oki2", okim6295_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki1", okim6295_r) + AM_RANGE(0x130000, 0x130001) AM_DEVREAD("oki2", okim6295_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END @@ -335,9 +335,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki1", okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVWRITE(SOUND, "oki2", okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki1", okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVWRITE("oki2", okim6295_w) 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) @@ -796,8 +796,8 @@ static void sound_irq(const device_config *device, int state) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki1"), ((data & 1)>>0) * 0x40000); - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki2"), ((data & 2)>>1) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki1"), ((data & 1)>>0) * 0x40000); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki2"), ((data & 2)>>1) * 0x40000); } static const ym2151_interface ym2151_config = diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index 1633fcb97e6..97db10e4099 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -78,7 +78,7 @@ static READ8_HANDLER( pip_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0020, 0x0020) AM_READ(watchdog_reset_r) - AM_RANGE(0x0030, 0x0031) AM_DEVREAD(SOUND, "konami", rollerg_sound_r) /* K053260 */ + AM_RANGE(0x0030, 0x0031) AM_DEVREAD("konami", rollerg_sound_r) /* K053260 */ AM_RANGE(0x0050, 0x0050) AM_READ_PORT("P1") AM_RANGE(0x0051, 0x0051) AM_READ_PORT("P2") AM_RANGE(0x0052, 0x0052) AM_READ_PORT("DSW3") @@ -97,7 +97,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0010, 0x0010) AM_WRITE(rollerg_0010_w) AM_RANGE(0x0020, 0x0020) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x0030, 0x0031) AM_DEVWRITE(SOUND, "konami", k053260_w) + AM_RANGE(0x0030, 0x0031) AM_DEVWRITE("konami", k053260_w) AM_RANGE(0x0040, 0x0040) AM_WRITE(soundirq_w) AM_RANGE(0x0100, 0x010f) AM_WRITE(SMH_NOP) /* 053252? */ AM_RANGE(0x0200, 0x020f) AM_WRITE(K051316_ctrl_0_w) @@ -112,15 +112,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xa000, 0xa02f) AM_DEVREAD(SOUND, "konami", k053260_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym3812_r) + AM_RANGE(0xa000, 0xa02f) AM_DEVREAD("konami", k053260_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym3812_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa02f) AM_DEVWRITE(SOUND, "konami", k053260_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xa000, 0xa02f) AM_DEVWRITE("konami", k053260_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index b0a3ac239f5..c1b30125e66 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -82,9 +82,9 @@ static ADDRESS_MAP_START( writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x4001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x5000, 0x5001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ay3", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index c12098f4410..d5c06c738e2 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -274,8 +274,8 @@ static ADDRESS_MAP_START( ttmahjng_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w) AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_WRITE(route16_out1_w) AM_RANGE(0x5800, 0x5800) AM_READWRITE(ttmahjng_input_port_matrix_r, ttmahjng_input_port_matrix_w) - AM_RANGE(0x6800, 0x6800) AM_DEVWRITE(SOUND, "ay8910", ay8910_data_w) - AM_RANGE(0x6900, 0x6900) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_w) + AM_RANGE(0x6800, 0x6800) AM_DEVWRITE("ay8910", ay8910_data_w) + AM_RANGE(0x6900, 0x6900) AM_DEVWRITE("ay8910", ay8910_address_w) AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram1) AM_SIZE(&route16_videoram_size) ADDRESS_MAP_END @@ -289,7 +289,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( stratvox_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2800, 0x2800) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x2800, 0x2800) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram2) ADDRESS_MAP_END @@ -297,8 +297,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu1_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x1ff) - AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "ay8910", ay8910_data_w) - AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x00ff) AM_DEVWRITE(SOUND, "ay8910", ay8910_address_w) + AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x00ff) AM_DEVWRITE("ay8910", ay8910_data_w) + AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x00ff) AM_DEVWRITE("ay8910", ay8910_address_w) ADDRESS_MAP_END @@ -574,7 +574,7 @@ static const ay8910_interface stratvox_ay8910_interface = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "sn", stratvox_sn76477_w), /* SN76477 commands (not used in Route 16?) */ + DEVCB_DEVICE_HANDLER("sn", stratvox_sn76477_w), /* SN76477 commands (not used in Route 16?) */ DEVCB_NULL }; diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index f6e4a856a8d..daef39f502b 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -382,16 +382,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x12, 0x12 ) AM_READ_PORT("DSW2") @@ -400,8 +400,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x80, 0x80 ) AM_READ( suzume_dsw_r ) @@ -410,8 +410,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x85, 0x85 ) AM_READ_PORT("DSW2") // DSW2 @@ -421,8 +421,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( makaijan_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x84, 0x84 ) AM_READ_PORT("DSW2") // DSW2 @@ -432,8 +432,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x61, 0x61 ) AM_WRITE(tontonb_bank_w) @@ -443,8 +443,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x44, 0x44 ) AM_WRITE( tontonb_bank_w ) @@ -454,8 +454,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) AM_RANGE( 0x00, 0x00 ) AM_READWRITE( majs101b_dsw_r, dynax_bank_w ) @@ -463,8 +463,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) // AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_RANGE( 0x10, 0x10 ) AM_WRITE( mjderngr_coin_w ) // palette bank is set separately AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) @@ -477,8 +477,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x00, 0x00 ) AM_WRITE( mjapinky_bank_w ) - AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x04, 0x04 ) AM_READ_PORT("DSW2") AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( mjapinky_palbank_w ) AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) @@ -572,9 +572,9 @@ static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x1c, 0x1c ) AM_READ( janptr96_dsw_r ) AM_RANGE( 0x20, 0x20 ) AM_READWRITE( janptr96_unknown_r, janptr96_rambank_w ) AM_RANGE( 0x50, 0x50 ) AM_WRITE( mjderngr_palbank_w ) - AM_RANGE( 0x60, 0x6f ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w) - AM_RANGE( 0x81, 0x81 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x82, 0x83 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x60, 0x6f ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) + AM_RANGE( 0x81, 0x81 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x82, 0x83 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x93, 0x93 ) AM_WRITE( input_port_select_w ) AM_RANGE( 0xd8, 0xd8 ) AM_WRITE( janptr96_coin_counter_w ) AM_RANGE( 0xd9, 0xd9 ) AM_READ_PORT("SYSTEM") @@ -604,7 +604,7 @@ static READ8_HANDLER( mjifb_rom_io_r ) { case 0x8000: return input_port_read(space->machine, "DSW4"); // dsw 4 case 0x8200: return input_port_read(space->machine, "DSW3"); // dsw 3 - case 0x9001: return ay8910_r(devtag_get_device(space->machine,SOUND,"ay"), 0); // inputs + case 0x9001: return ay8910_r(devtag_get_device(space->machine,"ay"), 0); // inputs case 0x9011: return input_port_read(space->machine, "SYSTEM"); } @@ -625,8 +625,8 @@ static WRITE8_HANDLER( mjifb_rom_io_w ) switch(offset) { case 0x8e00: palette_base = data & 0x1f; return; - case 0x9002: ay8910_data_w(devtag_get_device(space->machine,SOUND,"ay"),0,data); return; - case 0x9003: ay8910_address_w(devtag_get_device(space->machine,SOUND,"ay"),0,data); return; + case 0x9002: ay8910_data_w(devtag_get_device(space->machine,"ay"),0,data); return; + case 0x9003: ay8910_address_w(devtag_get_device(space->machine,"ay"),0,data); return; case 0x9010: mjifb_coin_counter_w(space,0,data); return; @@ -711,7 +711,7 @@ static READ8_HANDLER( mjdejavu_rom_io_r ) { case 0x8000: return input_port_read(space->machine, "DSW2"); // dsw 2 case 0x8001: return input_port_read(space->machine, "DSW1"); // dsw 1 - case 0x9001: return ay8910_r(devtag_get_device(space->machine,SOUND,"ay"), 0); // inputs + case 0x9001: return ay8910_r(devtag_get_device(space->machine,"ay"), 0); // inputs case 0x9011: return input_port_read(space->machine, "SYSTEM"); } @@ -731,8 +731,8 @@ static WRITE8_HANDLER( mjdejavu_rom_io_w ) switch(offset) { case 0x8802: palette_base = data & 0x1f; return; - case 0x9002: ay8910_data_w(devtag_get_device(space->machine,SOUND,"ay"),0,data); return; - case 0x9003: ay8910_address_w(devtag_get_device(space->machine,SOUND,"ay"),0,data); return; + case 0x9002: ay8910_data_w(devtag_get_device(space->machine,"ay"),0,data); return; + case 0x9003: ay8910_address_w(devtag_get_device(space->machine,"ay"),0,data); return; case 0x9010: mjifb_coin_counter_w(space,0,data); return; case 0x9011: input_port_select_w(space,0,data); return; case 0x9013: @@ -778,11 +778,11 @@ static WRITE8_HANDLER( mjtensin_6ff3_w ) static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x6fbf ) AM_RAM - AM_RANGE( 0x6fc1, 0x6fc1 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x6fc2, 0x6fc3 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x6fc1, 0x6fc1 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x6fc2, 0x6fc3 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x6fd0, 0x6fd0 ) AM_WRITE( janptr96_coin_counter_w ) AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w ) - AM_RANGE( 0x6fe0, 0x6fef ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w) + AM_RANGE( 0x6fe0, 0x6fef ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) AM_RANGE( 0x6ff0, 0x6ff0 ) AM_READWRITE( janptr96_dsw_r, janptr96_dswsel_w ) AM_RANGE( 0x6ff1, 0x6ff1 ) AM_WRITE( mjderngr_palbank_w ) AM_RANGE( 0x6ff3, 0x6ff3 ) AM_WRITE( mjtensin_6ff3_w ) @@ -846,8 +846,8 @@ static WRITE8_HANDLER( cafetime_7fe3_w ) static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x7eff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x7fc1, 0x7fc1 ) AM_DEVREAD( SOUND, "ay", ay8910_r ) - AM_RANGE( 0x7fc2, 0x7fc3 ) AM_DEVWRITE( SOUND, "ay", ay8910_data_address_w ) + AM_RANGE( 0x7fc1, 0x7fc1 ) AM_DEVREAD( "ay", ay8910_r ) + AM_RANGE( 0x7fc2, 0x7fc3 ) AM_DEVWRITE( "ay", ay8910_data_address_w ) AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w ) AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READ_PORT("SYSTEM") AM_WRITENOP AM_RANGE( 0x7fd3, 0x7fd3 ) AM_WRITE( input_port_select_w ) @@ -856,7 +856,7 @@ static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x7fe2, 0x7fe2 ) AM_WRITE( mjderngr_palbank_w ) AM_RANGE( 0x7fe3, 0x7fe3 ) AM_WRITE( cafetime_7fe3_w ) AM_RANGE( 0x7fe4, 0x7fe4 ) AM_READ( cafetime_7fe4_r ) - AM_RANGE( 0x7ff0, 0x7fff ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w) + AM_RANGE( 0x7ff0, 0x7fff ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) 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 69dddaa805e..bef47681f5b 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -281,7 +281,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) - AM_RANGE(0xf000, 0xf001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xf200, 0xf200) AM_READ(sound_command_r) AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -289,9 +289,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "upd", upd_control_w) - AM_RANGE(0xf600, 0xf600) AM_DEVWRITE(SOUND, "upd", upd_data_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("upd", upd_control_w) + AM_RANGE(0xf600, 0xf600) AM_DEVWRITE("upd", upd_data_w) 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 a4f63cf18b1..e740d880c8d 100644 --- a/src/mame/drivers/runaway.c +++ b/src/mame/drivers/runaway.c @@ -90,9 +90,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0400, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3007) AM_READ(runaway_input_r) AM_RANGE(0x4000, 0x4000) AM_READ_PORT("4000") - AM_RANGE(0x5000, 0x5000) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) - AM_RANGE(0x6000, 0x600f) AM_DEVREAD(SOUND, "pokey1", pokey_r) - AM_RANGE(0x7000, 0x700f) AM_DEVREAD(SOUND, "pokey2", pokey_r) + AM_RANGE(0x5000, 0x5000) AM_DEVREAD("earom", atari_vg_earom_r) + AM_RANGE(0x6000, 0x600f) AM_DEVREAD("pokey1", pokey_r) + AM_RANGE(0x7000, 0x700f) AM_DEVREAD("pokey2", pokey_r) AM_RANGE(0x8000, 0xcfff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) /* for the interrupt vectors */ ADDRESS_MAP_END @@ -103,15 +103,15 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0400, 0x07bf) AM_WRITE(runaway_video_ram_w) AM_BASE(&runaway_video_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_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x1800, 0x1800) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x1400, 0x143F) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x1800, 0x1800) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(runaway_paletteram_w) 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_DEVWRITE(SOUND, "pokey1", pokey_w) - AM_RANGE(0x7000, 0x700f) AM_DEVWRITE(SOUND, "pokey2", pokey_w) + AM_RANGE(0x6000, 0x600f) AM_DEVWRITE("pokey1", pokey_w) + AM_RANGE(0x7000, 0x700f) AM_DEVWRITE("pokey2", pokey_w) 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 ea7e0fe2eea..9038883dccd 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -277,9 +277,9 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami1", k054539_r) + AM_RANGE(0xe000, 0xe22f) AM_DEVREAD("konami1", k054539_r) AM_RANGE(0xe230, 0xe3ff) AM_READ(SMH_RAM) - AM_RANGE(0xe400, 0xe62f) AM_DEVREAD(SOUND, "konami2", k054539_r) + AM_RANGE(0xe400, 0xe62f) AM_DEVREAD("konami2", k054539_r) AM_RANGE(0xe630, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) @@ -288,9 +288,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe22f) AM_DEVWRITE(SOUND, "konami1", k054539_w) + AM_RANGE(0xe000, 0xe22f) AM_DEVWRITE("konami1", k054539_w) AM_RANGE(0xe230, 0xe3ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe400, 0xe62f) AM_DEVWRITE(SOUND, "konami2", k054539_w) + AM_RANGE(0xe400, 0xe62f) AM_DEVWRITE("konami2", k054539_w) 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) @@ -641,7 +641,7 @@ static DRIVER_INIT( rng ) static MACHINE_RESET( rng ) { - k054539_init_flags(devtag_get_device(machine, SOUND, "konami1"), K054539_REVERSE_STEREO); + k054539_init_flags(devtag_get_device(machine, "konami1"), K054539_REVERSE_STEREO); memset(rng_sysreg, 0, 0x20); diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 3e984133e89..7c9ed08bc3c 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -272,8 +272,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sandscrp_soundport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sandscrp_bankswitch_w) // ROM Bank - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) // PORTA/B read - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "oki", okim6295_w) // OKIM6295 + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // PORTA/B read + AM_RANGE(0x04, 0x04) AM_DEVWRITE("oki", okim6295_w) // OKIM6295 AM_RANGE(0x06, 0x06) AM_WRITE(sandscrp_soundlatch_w) // AM_RANGE(0x07, 0x07) AM_READ(sandscrp_soundlatch_r) // AM_RANGE(0x08, 0x08) AM_READ(sandscrp_latchstatus_r) // diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index 58dbc526078..9e1ff484f4f 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -78,7 +78,7 @@ static WRITE8_HANDLER(pzlestar_bank_w) static ADDRESS_MAP_START( pzlestar_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ym", ym2413_w ) AM_RANGE( 0x91, 0x91) AM_WRITE( pzlestar_bank_w ) AM_RANGE( 0x98, 0x98) AM_READWRITE( v9938_0_vram_r, v9938_0_vram_w ) AM_RANGE( 0x99, 0x99) AM_READWRITE( v9938_0_status_r, v9938_0_command_w ) @@ -100,7 +100,7 @@ static ADDRESS_MAP_START( sexyboom_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0xf1, 0xf1) AM_READ( v9938_0_status_r ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ym", ym2413_w ) AM_RANGE( 0xf0, 0xf0) AM_WRITE( v9938_0_vram_w ) AM_RANGE( 0xf1, 0xf1) AM_WRITE( v9938_0_command_w ) AM_RANGE( 0xf2, 0xf2) AM_WRITE( v9938_0_palette_w ) diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index 80dde6ad385..82bf3149eb3 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -185,8 +185,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sauro_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "speech", adpcm_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("speech", adpcm_w) AM_RANGE(0xe000, 0xe006) AM_WRITE(SMH_NOP) /* echo from write to e0000 */ AM_RANGE(0xe00e, 0xe00f) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -208,7 +208,7 @@ static ADDRESS_MAP_START( trckydoc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf821) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xf820, 0xf821) AM_DEVWRITE("ym", ym3812_w) AM_RANGE(0xf830, 0xf830) AM_WRITE(tecfri_scroll_bg_w) AM_RANGE(0xf838, 0xf838) AM_WRITE(SMH_NOP) /* only written at startup */ AM_RANGE(0xf839, 0xf839) AM_WRITE(flip_screen_w) diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index e041ef51aa9..1609b2ef468 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -115,11 +115,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* speech data */ - AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE(SOUND, "vlm", hyperspt_sound_w) /* speech and output controll */ - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("vlm", vlm5030_data_w) /* speech data */ + AM_RANGE(0xc000, 0xdfff) AM_DEVWRITE("vlm", hyperspt_sound_w) /* speech and output controll */ + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xe002, 0xe002) AM_DEVWRITE(SOUND, "sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("sn", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */ ADDRESS_MAP_END diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index e41f59f0189..5c59b1a3a11 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -187,8 +187,8 @@ 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_RAM_WRITE(sbw_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xf801, 0xf801) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xf801, 0xf801) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xfc00, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 26e62dd4c8e..b69e87de6a4 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -120,7 +120,7 @@ static TIMER_CALLBACK( scanline_callback ) cpu_set_input_line(machine->cpu[0], 0, ASSERT_LINE); /* update the DAC state */ - dac_data_w(devtag_get_device(machine, SOUND, "dac"), (videoram[0x380 + 0x11] & (scanline >> 2)) ? 255 : 0); + dac_data_w(devtag_get_device(machine, "dac"), (videoram[0x380 + 0x11] & (scanline >> 2)) ? 255 : 0); /* on the VBLANK, read the pot and schedule an interrupt time for it */ if (scanline == video_screen_get_visible_area(machine->primary_screen)->max_y + 1) diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 40a9eec08ac..ddc0a871074 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -138,8 +138,8 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xe4, 0xe4) AM_WRITENOP // 8156 timer reg1 (write 7f = CNT length) AM_RANGE(0xe5, 0xe5) AM_WRITENOP // 8156 timer reg2 (write c0 = timer mode - automatic reload, i.e. single pulse every time TC is reached) - AM_RANGE(0xe8, 0xe8) AM_DEVWRITE(SOUND, "sn76489.1", sn76496_w) - AM_RANGE(0xe9, 0xe9) AM_DEVWRITE(SOUND, "sn76489.2", sn76496_w) + AM_RANGE(0xe8, 0xe8) AM_DEVWRITE("sn76489.1", sn76496_w) + AM_RANGE(0xe9, 0xe9) AM_DEVWRITE("sn76489.2", sn76496_w) ADDRESS_MAP_END /* gfx decode */ diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index ab691b1c808..9350a679641 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -105,8 +105,8 @@ static ADDRESS_MAP_START( type1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) AM_RANGE(0x8c00, 0x8fff) AM_READ(galaxold_videoram_r) /* mirror */ AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9803) AM_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0xa000, 0xa003) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x9800, 0x9803) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0xa000, 0xa003) AM_DEVREAD("ppi8255_1", ppi8255_r) AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r) ADDRESS_MAP_END @@ -119,8 +119,8 @@ static ADDRESS_MAP_START( type1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9040, 0x905f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size) AM_RANGE(0x9060, 0x907f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_bulletsram) AM_SIZE(&galaxold_bulletsram_size) AM_RANGE(0x9080, 0x90ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9800, 0x9803) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0xa000, 0xa003) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x9800, 0x9803) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0xa000, 0xa003) AM_DEVWRITE("ppi8255_1", ppi8255_w) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w) AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxold_coin_counter_w) AM_RANGE(0xa804, 0xa804) AM_WRITE(galaxold_stars_enable_w) @@ -134,8 +134,8 @@ static ADDRESS_MAP_START( type2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxold_videoram_r) /* mirror */ AM_RANGE(0x9800, 0x9800) AM_READ(watchdog_reset_r) - AM_RANGE(0xa000, 0xa00f) AM_DEVREAD(PPI8255, "ppi8255_0", scobra_type2_ppi8255_r) - AM_RANGE(0xa800, 0xa80f) AM_DEVREAD(PPI8255, "ppi8255_1", scobra_type2_ppi8255_r) + AM_RANGE(0xa000, 0xa00f) AM_DEVREAD("ppi8255_0", scobra_type2_ppi8255_r) + AM_RANGE(0xa800, 0xa80f) AM_DEVREAD("ppi8255_1", scobra_type2_ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( type2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -147,8 +147,8 @@ static ADDRESS_MAP_START( type2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8880, 0x88ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(galaxold_videoram_w) /* mirror */ - AM_RANGE(0xa000, 0xa00f) AM_DEVWRITE(PPI8255, "ppi8255_0", scobra_type2_ppi8255_w) - AM_RANGE(0xa800, 0xa80f) AM_DEVWRITE(PPI8255, "ppi8255_1", scobra_type2_ppi8255_w) + AM_RANGE(0xa000, 0xa00f) AM_DEVWRITE("ppi8255_0", scobra_type2_ppi8255_w) + AM_RANGE(0xa800, 0xa80f) AM_DEVWRITE("ppi8255_1", scobra_type2_ppi8255_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(galaxold_stars_enable_w) AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_nmi_enable_w) AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_coin_counter_0_w) @@ -162,8 +162,8 @@ static ADDRESS_MAP_START( hustler_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", hustler_ppi8255_r) - AM_RANGE(0xe000, 0xe01f) AM_DEVREAD(PPI8255, "ppi8255_1", hustler_ppi8255_r) + AM_RANGE(0xd000, 0xd01f) AM_DEVREAD("ppi8255_0", hustler_ppi8255_r) + AM_RANGE(0xe000, 0xe01f) AM_DEVREAD("ppi8255_1", hustler_ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -178,8 +178,8 @@ static ADDRESS_MAP_START( hustler_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa804, 0xa804) AM_WRITE(galaxold_nmi_enable_w) AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_y_w) AM_RANGE(0xa80e, 0xa80e) AM_WRITE(SMH_NOP) /* coin counters */ - AM_RANGE(0xd000, 0xd01f) AM_DEVWRITE(PPI8255, "ppi8255_0", hustler_ppi8255_w) - AM_RANGE(0xe000, 0xe01f) AM_DEVWRITE(PPI8255, "ppi8255_1", hustler_ppi8255_w) + AM_RANGE(0xd000, 0xd01f) AM_DEVWRITE("ppi8255_0", hustler_ppi8255_w) + AM_RANGE(0xe000, 0xe01f) AM_DEVWRITE("ppi8255_1", hustler_ppi8255_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -187,8 +187,8 @@ static ADDRESS_MAP_START( hustlerb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0xc200, 0xc203) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0xc100, 0xc103) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0xc200, 0xc203) AM_DEVREAD("ppi8255_1", ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -203,8 +203,8 @@ static ADDRESS_MAP_START( hustlerb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa802, 0xa802) AM_WRITE(SMH_NOP) /* coin counters */ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_y_w) AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxold_flip_screen_x_w) - AM_RANGE(0xc100, 0xc103) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0xc200, 0xc203) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0xc100, 0xc103) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0xc200, 0xc203) AM_DEVWRITE("ppi8255_1", ppi8255_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mimonkey_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -212,8 +212,8 @@ static ADDRESS_MAP_START( mimonkey_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) AM_RANGE(0x8c00, 0x8fff) AM_READ(galaxold_videoram_r) /* mirror */ AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9803) AM_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0xa000, 0xa003) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x9800, 0x9803) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0xa000, 0xa003) AM_DEVREAD("ppi8255_1", ppi8255_r) AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r) AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -227,8 +227,8 @@ static ADDRESS_MAP_START( mimonkey_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9040, 0x905f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size) AM_RANGE(0x9060, 0x907f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_bulletsram) AM_SIZE(&galaxold_bulletsram_size) AM_RANGE(0x9080, 0x90ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9800, 0x9803) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0xa000, 0xa003) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x9800, 0x9803) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0xa000, 0xa003) AM_DEVWRITE("ppi8255_1", ppi8255_w) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxold_gfxbank_w) AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_x_w) @@ -302,10 +302,10 @@ static ADDRESS_MAP_START( anteatg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg0_r) - AM_RANGE(0xf631, 0xf631) AM_DEVREAD(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg1_r) - AM_RANGE(0xf710, 0xf710) AM_DEVREAD(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg2_r) - AM_RANGE(0xf753, 0xf753) AM_DEVREAD(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg3_r) + AM_RANGE(0xf612, 0xf612) AM_DEVREAD("ppi8255_0", anteatg_ppi8255_0_reg0_r) + AM_RANGE(0xf631, 0xf631) AM_DEVREAD("ppi8255_0", anteatg_ppi8255_0_reg1_r) + AM_RANGE(0xf710, 0xf710) AM_DEVREAD("ppi8255_0", anteatg_ppi8255_0_reg2_r) + AM_RANGE(0xf753, 0xf753) AM_DEVREAD("ppi8255_0", anteatg_ppi8255_0_reg3_r) ADDRESS_MAP_END static ADDRESS_MAP_START( anteatg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -316,9 +316,9 @@ static ADDRESS_MAP_START( anteatg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2040, 0x205f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size) AM_RANGE(0x2060, 0x207f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_bulletsram) AM_SIZE(&galaxold_bulletsram_size) AM_RANGE(0x2080, 0x20ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2423, 0x2423) AM_DEVWRITE(PPI8255, "ppi8255_1", anteatg_ppi8255_1_reg3_w) - AM_RANGE(0x2450, 0x2450) AM_DEVWRITE(PPI8255, "ppi8255_1", anteatg_ppi8255_1_reg0_w) - AM_RANGE(0x2511, 0x2511) AM_DEVWRITE(PPI8255, "ppi8255_1", anteatg_ppi8255_1_reg1_w) + AM_RANGE(0x2423, 0x2423) AM_DEVWRITE("ppi8255_1", anteatg_ppi8255_1_reg3_w) + AM_RANGE(0x2450, 0x2450) AM_DEVWRITE("ppi8255_1", anteatg_ppi8255_1_reg0_w) + AM_RANGE(0x2511, 0x2511) AM_DEVWRITE("ppi8255_1", anteatg_ppi8255_1_reg1_w) AM_RANGE(0x2621, 0x2621) AM_WRITE(galaxold_nmi_enable_w) AM_RANGE(0x2624, 0x2624) AM_WRITE(galaxold_stars_enable_w) AM_RANGE(0x2647, 0x2647) AM_WRITE(galaxold_flip_screen_y_w) @@ -330,10 +330,10 @@ static ADDRESS_MAP_START( anteatg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7c00, 0x7fff) AM_WRITE(galaxold_videoram_w) /* mirror */ AM_RANGE(0x8300, 0x98ff) AM_WRITE(SMH_ROM) AM_RANGE(0xa300, 0xa7ff) AM_WRITE(SMH_ROM) - AM_RANGE(0xf612, 0xf612) AM_DEVWRITE(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg0_w) - AM_RANGE(0xf631, 0xf631) AM_DEVWRITE(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg1_w) - AM_RANGE(0xf710, 0xf710) AM_DEVWRITE(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg2_w) - AM_RANGE(0xf753, 0xf753) AM_DEVWRITE(PPI8255, "ppi8255_0", anteatg_ppi8255_0_reg3_w) + AM_RANGE(0xf612, 0xf612) AM_DEVWRITE("ppi8255_0", anteatg_ppi8255_0_reg0_w) + AM_RANGE(0xf631, 0xf631) AM_DEVWRITE("ppi8255_0", anteatg_ppi8255_0_reg1_w) + AM_RANGE(0xf710, 0xf710) AM_DEVWRITE("ppi8255_0", anteatg_ppi8255_0_reg2_w) + AM_RANGE(0xf753, 0xf753) AM_DEVWRITE("ppi8255_0", anteatg_ppi8255_0_reg3_w) ADDRESS_MAP_END static ADDRESS_MAP_START( anteatgb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -345,8 +345,8 @@ static ADDRESS_MAP_START( anteatgb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0xfe00, 0xfe03) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0xf300, 0xf303) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0xfe00, 0xfe03) AM_DEVREAD("ppi8255_1", ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( anteatgb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -367,8 +367,8 @@ static ADDRESS_MAP_START( anteatgb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0xfe00, 0xfe03) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0xf300, 0xf303) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0xfe00, 0xfe03) AM_DEVWRITE("ppi8255_1", ppi8255_w) ADDRESS_MAP_END static UINT8 *scobra_soundram; @@ -406,10 +406,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( scobra_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x20, 0x20) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_data_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_data_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -425,15 +425,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) ADDRESS_MAP_END /* stratgyx coinage DIPs are spread accross two input ports */ diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index 0db2472d1d4..1efca5e5fc9 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -100,7 +100,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( scotrsht_sound_port, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c index a982e98e85d..8c37b713f62 100644 --- a/src/mame/drivers/scramble.c +++ b/src/mame/drivers/scramble.c @@ -43,9 +43,9 @@ static ADDRESS_MAP_START( scramble_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0x8110, 0x8113) AM_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) /* mirror for Frog */ - AM_RANGE(0x8200, 0x8203) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x8100, 0x8103) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0x8110, 0x8113) AM_DEVREAD("ppi8255_0", ppi8255_r) /* mirror for Frog */ + AM_RANGE(0x8200, 0x8203) AM_DEVREAD("ppi8255_1", ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( scramble_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -62,8 +62,8 @@ static ADDRESS_MAP_START( scramble_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6804, 0x6804) AM_WRITE(galaxold_stars_enable_w) AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxold_flip_screen_x_w) AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxold_flip_screen_y_w) - AM_RANGE(0x8100, 0x8103) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0x8200, 0x8203) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x8100, 0x8103) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0x8200, 0x8203) AM_DEVWRITE("ppi8255_1", ppi8255_w) ADDRESS_MAP_END @@ -108,8 +108,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ckongs_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) AM_RANGE(0x6000, 0x6bff) AM_READ(SMH_RAM) - AM_RANGE(0x7000, 0x7003) AM_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0x7800, 0x7803) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x7000, 0x7003) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0x7800, 0x7803) AM_DEVREAD("ppi8255_1", ppi8255_r) 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) @@ -118,8 +118,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ckongs_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6000, 0x6bff) AM_WRITE(SMH_RAM) - AM_RANGE(0x7000, 0x7003) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0x7800, 0x7803) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x7000, 0x7003) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0x7800, 0x7803) AM_DEVWRITE("ppi8255_1", ppi8255_w) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram) AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size) @@ -150,8 +150,8 @@ static ADDRESS_MAP_START( mars_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) AM_RANGE(0x7000, 0x7000) AM_READ(SMH_NOP) - AM_RANGE(0x8100, 0x810f) AM_DEVREAD(PPI8255, "ppi8255_0", mars_ppi8255_r) - AM_RANGE(0x8200, 0x820f) AM_DEVREAD(PPI8255, "ppi8255_1", mars_ppi8255_r) + AM_RANGE(0x8100, 0x810f) AM_DEVREAD("ppi8255_0", mars_ppi8255_r) + AM_RANGE(0x8200, 0x820f) AM_DEVREAD("ppi8255_1", mars_ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mars_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -168,8 +168,8 @@ static ADDRESS_MAP_START( mars_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxold_coin_counter_0_w) AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxold_flip_screen_x_w) AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxold_flip_screen_y_w) - AM_RANGE(0x8100, 0x810f) AM_DEVWRITE(PPI8255, "ppi8255_0", mars_ppi8255_w) - AM_RANGE(0x8200, 0x820f) AM_DEVWRITE(PPI8255, "ppi8255_1", mars_ppi8255_w) + AM_RANGE(0x8100, 0x810f) AM_DEVWRITE("ppi8255_0", mars_ppi8255_w) + AM_RANGE(0x8200, 0x820f) AM_DEVWRITE("ppi8255_1", mars_ppi8255_w) ADDRESS_MAP_END @@ -179,9 +179,9 @@ static ADDRESS_MAP_START( newsin7_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxold_videoram_r) AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) - AM_RANGE(0x8200, 0x820f) AM_DEVREAD(PPI8255, "ppi8255_1", mars_ppi8255_r) + AM_RANGE(0x8200, 0x820f) AM_DEVREAD("ppi8255_1", mars_ppi8255_r) AM_RANGE(0xa000, 0xafff) AM_READ(SMH_ROM) - AM_RANGE(0xc100, 0xc10f) AM_DEVREAD(PPI8255, "ppi8255_0", mars_ppi8255_r) + AM_RANGE(0xc100, 0xc10f) AM_DEVREAD("ppi8255_0", mars_ppi8255_r) ADDRESS_MAP_END static ADDRESS_MAP_START( newsin7_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -198,9 +198,9 @@ static ADDRESS_MAP_START( newsin7_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxold_coin_counter_0_w) AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxold_flip_screen_x_w) AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxold_flip_screen_y_w) - AM_RANGE(0x8200, 0x820f) AM_DEVWRITE(PPI8255, "ppi8255_1", mars_ppi8255_w) + AM_RANGE(0x8200, 0x820f) AM_DEVWRITE("ppi8255_1", mars_ppi8255_w) AM_RANGE(0xa000, 0xafff) AM_WRITE(SMH_ROM) - AM_RANGE(0xc100, 0xc10f) AM_DEVWRITE(PPI8255, "ppi8255_0", mars_ppi8255_w) + AM_RANGE(0xc100, 0xc10f) AM_DEVWRITE("ppi8255_0", mars_ppi8255_w) ADDRESS_MAP_END @@ -218,8 +218,8 @@ static ADDRESS_MAP_START( mrkougar_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxold_coin_counter_0_w) AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxold_flip_screen_x_w) AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxold_flip_screen_y_w) - AM_RANGE(0x8100, 0x810f) AM_DEVWRITE(PPI8255, "ppi8255_0", mars_ppi8255_w) - AM_RANGE(0x8200, 0x820f) AM_DEVWRITE(PPI8255, "ppi8255_1", mars_ppi8255_w) + AM_RANGE(0x8100, 0x810f) AM_DEVWRITE("ppi8255_0", mars_ppi8255_w) + AM_RANGE(0x8200, 0x820f) AM_DEVWRITE("ppi8255_1", mars_ppi8255_w) ADDRESS_MAP_END @@ -256,9 +256,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbks_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) - AM_RANGE(0x1210, 0x1213) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x1210, 0x1213) AM_DEVREAD("ppi8255_1", ppi8255_r) AM_RANGE(0x1400, 0x14ff) AM_READ(SMH_RAM) - AM_RANGE(0x1500, 0x1503) AM_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) + AM_RANGE(0x1500, 0x1503) AM_DEVREAD("ppi8255_0", ppi8255_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(SMH_RAM) @@ -272,12 +272,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbks_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) - AM_RANGE(0x1210, 0x1213) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x1210, 0x1213) AM_DEVWRITE("ppi8255_1", ppi8255_w) AM_RANGE(0x1400, 0x143f) AM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram) AM_RANGE(0x1440, 0x145f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size) AM_RANGE(0x1460, 0x147f) AM_WRITE(SMH_RAM) AM_BASE(&galaxold_bulletsram) AM_SIZE(&galaxold_bulletsram_size) AM_RANGE(0x1480, 0x14ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1500, 0x1503) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) + AM_RANGE(0x1500, 0x1503) AM_DEVWRITE("ppi8255_0", ppi8255_w) AM_RANGE(0x1606, 0x1606) AM_WRITE(galaxold_flip_screen_x_w) AM_RANGE(0x1607, 0x1607) AM_WRITE(galaxold_flip_screen_y_w) AM_RANGE(0x1800, 0x1bff) AM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram) @@ -297,8 +297,8 @@ static ADDRESS_MAP_START( mimonscr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(PPI8255, "ppi8255_0", ppi8255_r) - AM_RANGE(0x8200, 0x8203) AM_DEVREAD(PPI8255, "ppi8255_1", ppi8255_r) + AM_RANGE(0x8100, 0x8103) AM_DEVREAD("ppi8255_0", ppi8255_r) + AM_RANGE(0x8200, 0x8203) AM_DEVREAD("ppi8255_1", ppi8255_r) AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -315,8 +315,8 @@ static ADDRESS_MAP_START( mimonscr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6800, 0x6802) AM_WRITE(galaxold_gfxbank_w) AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxold_flip_screen_x_w) AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxold_flip_screen_y_w) - AM_RANGE(0x8100, 0x8103) AM_DEVWRITE(PPI8255, "ppi8255_0", ppi8255_w) - AM_RANGE(0x8200, 0x8203) AM_DEVWRITE(PPI8255, "ppi8255_1", ppi8255_w) + AM_RANGE(0x8100, 0x8103) AM_DEVWRITE("ppi8255_0", ppi8255_w) + AM_RANGE(0x8200, 0x8203) AM_DEVWRITE("ppi8255_1", ppi8255_w) AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -349,18 +349,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( triplep_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "8910.1", ay8910_data_address_w) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "8910.1", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("8910.1", ay8910_data_address_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("8910.1", ay8910_r) AM_RANGE(0x02, 0x02) AM_READ(triplep_pip_r) AM_RANGE(0x03, 0x03) AM_READ(triplep_pap_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hotshock_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "8910.1", ay8910_address_w) - AM_RANGE(0x20, 0x20) AM_DEVREADWRITE(SOUND, "8910.1", ay8910_r, ay8910_data_w) - AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(SOUND, "8910.2", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "8910.2", ay8910_address_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("8910.1", ay8910_address_w) + AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("8910.1", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("8910.2", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("8910.2", ay8910_address_w) ADDRESS_MAP_END static READ8_HANDLER( hncholms_prot_r ) @@ -1304,10 +1304,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( scramble_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "8910.1", ay8910_address_w) - AM_RANGE(0x20, 0x20) AM_DEVREADWRITE(SOUND, "8910.1", ay8910_r, ay8910_data_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "8910.2", ay8910_address_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "8910.2", ay8910_r, ay8910_data_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("8910.1", ay8910_address_w) + AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("8910.1", ay8910_r, ay8910_data_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("8910.2", ay8910_address_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("8910.2", ay8910_r, ay8910_data_w) ADDRESS_MAP_END static MACHINE_DRIVER_START( scramble ) diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index 255226b6394..5d64fea5d0e 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -75,8 +75,8 @@ static ADDRESS_MAP_START( dommy_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2bff) AM_WRITE(btime_mirrorvideoram_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) AM_RANGE(0x4001, 0x4001) AM_WRITE(btime_video_control_w) - AM_RANGE(0x4004, 0x4005) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x4006, 0x4007) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x4004, 0x4005) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x4006, 0x4007) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -101,8 +101,8 @@ static ADDRESS_MAP_START( eggs_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_NOP) - AM_RANGE(0x2004, 0x2005) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x2006, 0x2007) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x2004, 0x2005) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x2006, 0x2007) AM_DEVWRITE("ay2", ay8910_address_data_w) 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 7be5ce642e3..8d23b616be3 100644 --- a/src/mame/drivers/sderby.c +++ b/src/mame/drivers/sderby.c @@ -295,7 +295,7 @@ static ADDRESS_MAP_START( sderby_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x200fff) AM_RAM AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x308000, 0x30800d) AM_READ(sderby_input_r) AM_RANGE(0x308008, 0x308009) AM_WRITE(sderby_out_w) /* output port */ - AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) /* unknown... write 0x01 in game, and 0x00 on reset */ AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) @@ -314,7 +314,7 @@ static ADDRESS_MAP_START( spacewin_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP) /* unknown... write 0x01 in game, and 0x00 on reset */ AM_RANGE(0x308000, 0x30800d) AM_READ(sderby_input_r) AM_RANGE(0x308008, 0x308009) AM_WRITE(scmatto_out_w) /* output port */ - AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0xd00000, 0xd001ff) AM_RAM AM_RANGE(0x800000, 0x800fff) AM_RAM AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) @@ -334,7 +334,7 @@ static ADDRESS_MAP_START( roulette_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x708000, 0x708009) AM_READ(roulette_input_r) AM_RANGE(0x708006, 0x708007) AM_WRITE(roulette_out_w) - AM_RANGE(0x70800a, 0x70800b) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x70800a, 0x70800b) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x70800c, 0x70800d) AM_WRITE(SMH_NOP) /* watchdog?? (0x0003) */ AM_RANGE(0x70800e, 0x70800f) AM_READWRITE(rprot_r, rprot_w) /* MCU communication */ 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 d522f0d411f..b8de9507f19 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -502,7 +502,7 @@ static MACHINE_START( seattle ) { int index; - voodoo_device = device_list_find_by_tag(machine->config->devicelist, VOODOO_GRAPHICS, "voodoo"); + voodoo_device = devtag_get_device(machine, "voodoo"); /* allocate timers for the galileo */ galileo.timer[0].timer = timer_alloc(machine, galileo_timer_callback, NULL); @@ -1738,10 +1738,10 @@ static READ32_DEVICE_HANDLER( seattle_ide_r ) static ADDRESS_MAP_START( seattle_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE(&rambase) // wg3dh only has 4MB; sfrush, blitz99 8MB - AM_RANGE(0x08000000, 0x08ffffff) AM_DEVREAD(VOODOO_GRAPHICS, "voodoo", voodoo_r) AM_WRITE(seattle_voodoo_w) - AM_RANGE(0x0a000000, 0x0a0003ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", seattle_ide_r, ide_controller32_w) + AM_RANGE(0x08000000, 0x08ffffff) AM_DEVREAD("voodoo", voodoo_r) AM_WRITE(seattle_voodoo_w) + AM_RANGE(0x0a000000, 0x0a0003ff) AM_DEVREADWRITE("ide", seattle_ide_r, ide_controller32_w) AM_RANGE(0x0a00040c, 0x0a00040f) AM_NOP // IDE-related, but annoying - AM_RANGE(0x0a000f00, 0x0a000f07) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_bus_master32_r, ide_bus_master32_w) + AM_RANGE(0x0a000f00, 0x0a000f07) AM_DEVREADWRITE("ide", ide_bus_master32_r, ide_bus_master32_w) AM_RANGE(0x0c000000, 0x0c000fff) AM_READWRITE(galileo_r, galileo_w) AM_RANGE(0x13000000, 0x13000003) AM_WRITE(asic_fifo_w) AM_RANGE(0x16000000, 0x1600003f) AM_READWRITE(midway_ioasic_r, midway_ioasic_w) @@ -2793,7 +2793,7 @@ static void init_common(running_machine *machine, int ioasic, int serialnum, int case SEATTLE_WIDGET_CONFIG: /* set up the widget board */ - device = device_list_find_by_tag(machine->config->devicelist, SMC91C94, "ethernet"); + device = devtag_get_device(machine, "ethernet"); memory_install_readwrite32_device_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), device, 0x16c00000, 0x16c0001f, 0, 0, widget_r, widget_w); break; @@ -2802,7 +2802,7 @@ static void init_common(running_machine *machine, int ioasic, int serialnum, int memory_install_readwrite32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x14000000, 0x14000003, 0, 0, analog_port_r, analog_port_w); /* set up the ethernet controller */ - device = device_list_find_by_tag(machine->config->devicelist, SMC91C94, "ethernet"); + device = devtag_get_device(machine, "ethernet"); memory_install_readwrite32_device_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), device, 0x16c00000, 0x16c0003f, 0, 0, ethernet_r, ethernet_w); break; } diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index dd03de53595..3711001a6bf 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -341,7 +341,7 @@ static READ16_HANDLER( io_chip_r ) /* otherwise, return an input port */ if (offset == 0x04/2 && sound_banks) - return (input_port_read(space->machine, portnames[offset]) & 0xbf) | (upd7759_busy_r(devtag_get_device(space->machine, SOUND, "upd")) << 6); + return (input_port_read(space->machine, portnames[offset]) & 0xbf) | (upd7759_busy_r(devtag_get_device(space->machine, "upd")) << 6); return input_port_read(space->machine, portnames[offset]); /* 'SEGA' protection */ @@ -428,7 +428,7 @@ static WRITE16_HANDLER( io_chip_w ) } if (sound_banks > 1) { - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd"); + const device_config *upd = devtag_get_device(space->machine, "upd"); newbank = (data >> 2) & (sound_banks - 1); upd7759_set_bank_base(upd, newbank * 0x20000); } @@ -438,7 +438,7 @@ static WRITE16_HANDLER( io_chip_w ) case 0x1c/2: if (sound_banks > 1) { - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd"); + const device_config *upd = devtag_get_device(space->machine, "upd"); upd7759_reset_w(upd, (data >> 1) & 1); } break; @@ -625,7 +625,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800001) AM_MIRROR(0x13fdfe) AM_READWRITE(prot_r, prot_w) AM_RANGE(0x800200, 0x800201) AM_MIRROR(0x13fdfe) AM_WRITE(control_w) AM_RANGE(0x840000, 0x84001f) AM_MIRROR(0x13fee0) AM_READWRITE(io_chip_r, io_chip_w) - AM_RANGE(0x840100, 0x840107) AM_MIRROR(0x13fef8) AM_DEVREADWRITE8(SOUND, "ym", ym3438_r, ym3438_w, 0x00ff) + AM_RANGE(0x840100, 0x840107) AM_MIRROR(0x13fef8) AM_DEVREADWRITE8("ym", ym3438_r, ym3438_w, 0x00ff) AM_RANGE(0x880100, 0x880101) AM_MIRROR(0x13fefe) AM_WRITE(counter_timer_w) AM_RANGE(0x8c0000, 0x8c0fff) AM_MIRROR(0x13f000) AM_READWRITE(palette_r, palette_w) AM_BASE(&paletteram16) AM_RANGE(0xc00000, 0xc0001f) AM_MIRROR(0x18ff00) AM_READWRITE(megadriv_vdp_r, megadriv_vdp_w) @@ -1819,7 +1819,7 @@ it should be, otherwise I don't see how the formula could be computed. static void segac2_common_init(running_machine* machine, int (*func)(int in)) { - const device_config *upd = devtag_get_device(machine, SOUND, "upd"); + const device_config *upd = devtag_get_device(machine, "upd"); DRIVER_INIT_CALL( megadriv_c2 ); diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 0eb57090aed..950f2a5bfac 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -2157,8 +2157,8 @@ static void init_ports_systeme(running_machine *machine) /* INIT THE PORTS *********************************************************************************************/ const address_space *io = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO); - const device_config *sn1 = devtag_get_device(machine, SOUND, "sn1"); - const device_config *sn2 = devtag_get_device(machine, SOUND, "sn2"); + const device_config *sn1 = devtag_get_device(machine, "sn1"); + const device_config *sn2 = devtag_get_device(machine, "sn2"); memory_install_write8_device_handler(io, sn2, 0x7b, 0x7b, 0, 0, sn76496_w); memory_install_write8_device_handler(io, sn1, 0x7e, 0x7f, 0, 0, sn76496_w); diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index 88bd1588945..a6ce32e3e28 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -364,7 +364,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_ppi8255_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0xbe, 0xbf) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w) AM_RANGE(0xf9, 0xf9) AM_MIRROR(0x04) AM_WRITE(coin_count_w) AM_RANGE(0xf8, 0xfb) AM_READ(mangled_ports_r) @@ -375,7 +375,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sindbadm_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x42, 0x43) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w) - AM_RANGE(0x80, 0x83) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0xf8, 0xfb) AM_READ(mangled_ports_r) ADDRESS_MAP_END @@ -391,8 +391,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sindbadm_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "sn1", sindbadm_SN76496_w) - AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "sn2", sindbadm_SN76496_w) + AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1ffc) AM_DEVWRITE("sn1", sindbadm_SN76496_w) + AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1ffc) AM_DEVWRITE("sn2", sindbadm_SN76496_w) AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c index 0dd138c0cb1..19a81c535ba 100644 --- a/src/mame/drivers/segag80v.c +++ b/src/mame/drivers/segag80v.c @@ -1367,7 +1367,7 @@ static DRIVER_INIT( spacfury ) static DRIVER_INIT( zektor ) { const address_space *iospace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO); - const device_config *ay = devtag_get_device(machine, SOUND, "ay"); + const device_config *ay = devtag_get_device(machine, "ay"); /* configure security */ sega_security(82); diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 105c333f577..24b38b5e1a6 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -148,7 +148,7 @@ static INTERRUPT_GEN( hangon_irq ) static TIMER_CALLBACK( delayed_ppi8255_w ) { - ppi8255_w(devtag_get_device(machine, PPI8255, "ppi8255_0"), param >> 8, param & 0xff); + ppi8255_w(devtag_get_device(machine, "ppi8255_0"), param >> 8, param & 0xff); } @@ -157,7 +157,7 @@ static READ16_HANDLER( hangon_io_r ) switch (offset & 0x3020/2) { case 0x0000/2: /* PPI @ 4B */ - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), offset & 3); case 0x1000/2: /* Input ports and DIP switches */ { @@ -166,7 +166,7 @@ static READ16_HANDLER( hangon_io_r ) } case 0x3000/2: /* PPI @ 4C */ - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), offset & 3); case 0x3020/2: /* ADC0804 data output */ { @@ -192,7 +192,7 @@ static WRITE16_HANDLER( hangon_io_w ) return; case 0x3000/2: /* PPI @ 4C */ - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3, data & 0xff); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), offset & 3, data & 0xff); return; case 0x3020/2: /* ADC0804 */ @@ -208,7 +208,7 @@ static READ16_HANDLER( sharrier_io_r ) switch (offset & 0x0030/2) { case 0x0000/2: - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255_0"), offset & 3); case 0x0010/2: /* Input ports and DIP switches */ { @@ -218,7 +218,7 @@ static READ16_HANDLER( sharrier_io_r ) case 0x0020/2: /* PPI @ 4C */ if (offset == 2) return 0; - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255_1"), offset & 3); case 0x0030/2: /* ADC0804 data output */ { @@ -244,7 +244,7 @@ static WRITE16_HANDLER( sharrier_io_w ) return; case 0x0020/2: /* PPI @ 4C */ - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset & 3, data & 0xff); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), offset & 3, data & 0xff); return; case 0x0030/2: /* ADC0804 */ @@ -375,7 +375,7 @@ static void sound_irq(const device_config *device, int irq) static READ8_HANDLER( sound_data_r ) { /* assert ACK */ - ppi8255_set_port_c(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), 0x00); + ppi8255_set_port_c(devtag_get_device(space->machine, "ppi8255_0"), 0x00); return soundlatch_r(space, offset); } @@ -443,8 +443,8 @@ static ADDRESS_MAP_START( sound_map_2203, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x0800) AM_RAM - AM_RANGE(0xd000, 0xd001) AM_MIRROR(0x0ffe) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) - AM_RANGE(0xe000, 0xe0ff) AM_MIRROR(0x0f00) AM_DEVREADWRITE(SOUND, "pcm", sega_pcm_r, sega_pcm_w) + AM_RANGE(0xd000, 0xd001) AM_MIRROR(0x0ffe) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) + AM_RANGE(0xe000, 0xe0ff) AM_MIRROR(0x0f00) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap_2203, ADDRESS_SPACE_IO, 8 ) @@ -457,23 +457,23 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map_2151, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x700) AM_DEVREADWRITE(SOUND, "pcm", sega_pcm_r, sega_pcm_w) + AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap_2151, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap_2203x2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) - AM_RANGE(0xc0, 0xc1) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0xc0, 0xc1) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 7d3f470169f..f686e36059c 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -329,7 +329,7 @@ GFXDECODE_END static MACHINE_START( astron ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index e00e4268aa4..0b77b9c1993 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -372,7 +372,7 @@ static READ16_HANDLER( outrun_custom_io_r ) switch (offset & 0x70/2) { case 0x00/2: - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255"), offset & 3); case 0x10/2: { @@ -402,7 +402,7 @@ static WRITE16_HANDLER( outrun_custom_io_w ) { case 0x00/2: if (ACCESSING_BITS_0_7) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255"), offset & 3, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255"), offset & 3, data); return; case 0x20/2: @@ -546,14 +546,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xefff) AM_ROM - AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE(SOUND, "pcm", sega_pcm_r, sega_pcm_w) + AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 4c18e0148c2..f4120df366b 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -263,7 +263,7 @@ static MACHINE_RESET( system16a ) static TIMER_CALLBACK( delayed_ppi8255_w ) { - ppi8255_w(devtag_get_device(machine, PPI8255, "ppi8255"), param >> 8, param & 0xff); + ppi8255_w(devtag_get_device(machine, "ppi8255"), param >> 8, param & 0xff); } @@ -273,7 +273,7 @@ static READ16_HANDLER( standard_io_r ) switch (offset & (0x3000/2)) { case 0x0000/2: - return ppi8255_r(devtag_get_device(space->machine, PPI8255, "ppi8255"), offset & 3); + return ppi8255_r(devtag_get_device(space->machine, "ppi8255"), offset & 3); case 0x1000/2: { @@ -396,7 +396,7 @@ static WRITE8_DEVICE_HANDLER( tilemap_sound_w ) static READ8_HANDLER( sound_data_r ) { /* assert ACK */ - ppi8255_set_port_c(devtag_get_device(space->machine, PPI8255, "ppi8255"), 0x00); + ppi8255_set_port_c(devtag_get_device(space->machine, "ppi8255"), 0x00); return soundlatch_r(space, offset); } @@ -841,7 +841,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_WRITE(n7751_command_w) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -857,9 +857,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( n7751_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(n7751_rom_r) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(n7751_t1_r) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) - AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVREADWRITE(I8243, "n7751_8243", n7751_p2_r, n7751_p2_w) - AM_RANGE(MCS48_PORT_PROG, MCS48_PORT_PROG) AM_DEVWRITE(I8243, "n7751_8243", i8243_prog_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) + AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVREADWRITE("n7751_8243", n7751_p2_r, n7751_p2_w) + AM_RANGE(MCS48_PORT_PROG, MCS48_PORT_PROG) AM_DEVWRITE("n7751_8243", i8243_prog_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 93492f89879..e31dab2371c 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1558,7 +1558,7 @@ static void wrestwar_i8751_sim(running_machine *machine) static WRITE16_HANDLER( atomicp_sound_w ) { - ym2413_w(devtag_get_device(space->machine, SOUND, "ym"), offset, data >> 8); + ym2413_w(devtag_get_device(space->machine, "ym"), offset, data >> 8); } @@ -1785,9 +1785,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE(SOUND, "upd", upd7759_control_w) - AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_DEVREADWRITE(SOUND, "upd", upd7759_status_r, upd7759_port_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE("upd", upd7759_control_w) + AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_DEVREADWRITE("upd", upd7759_status_r, upd7759_port_w) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 59b4131f057..df0796c4cff 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -605,16 +605,16 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x10000) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE(SOUND, "rf", rf5c68_w) - AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE(SOUND, "rf", rf5c68_mem_r, rf5c68_mem_w) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rf", rf5c68_w) + AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rf", rf5c68_mem_r, rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE(SOUND, "ym1", ym3438_r, ym3438_w) - AM_RANGE(0x90, 0x93) AM_MIRROR(0x0c) AM_DEVREADWRITE(SOUND, "ym2", ym3438_r, ym3438_w) + AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym1", ym3438_r, ym3438_w) + AM_RANGE(0x90, 0x93) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym2", ym3438_r, ym3438_w) AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1f) AM_WRITE(soundbank_w) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_READWRITE(soundlatch_r, mcu_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index fc94b082527..826d22600be 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -598,7 +598,7 @@ static void mahmajn_io_w(running_machine *machine, int port, UINT8 data) cur_input_line = (cur_input_line + 1) & 7; break; case 7: // DAC - dac_signed_data_w(devtag_get_device(machine, SOUND, "dac"), data); + dac_signed_data_w(devtag_get_device(machine, "dac"), data); break; default: fprintf(stderr, "Port %d : %02x\n", port, data & 0xff); @@ -612,7 +612,7 @@ static void hotrod_io_w(running_machine *machine, int port, UINT8 data) case 3: // Lamps break; case 7: // DAC - dac_signed_data_w(devtag_get_device(machine, SOUND, "dac"), data); + dac_signed_data_w(devtag_get_device(machine, "dac"), data); break; default: fprintf(stderr, "Port %d : %02x\n", port, data & 0xff); @@ -699,7 +699,7 @@ static void reset_reset(running_machine *machine) cpu_set_input_line(machine->cpu[1], INPUT_LINE_HALT, ASSERT_LINE); } if(changed & 4) - devtag_reset(machine, SOUND, "ym"); + devtag_reset(machine, "ym"); prev_resetcontrol = resetcontrol; } @@ -1013,7 +1013,7 @@ static ADDRESS_MAP_START( system24_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_READWRITE(sys24_mixer_r, sys24_mixer_w) AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_READWRITE(sys24_sprite_r, sys24_sprite_w) AM_RANGE(0x800000, 0x80007f) AM_MIRROR(0x1ffe00) AM_READWRITE(system24temp_sys16_io_r, system24temp_sys16_io_w) - AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa00000, 0xa00007) AM_MIRROR(0x0ffff8) AM_READWRITE(irq_r, irq_w) AM_RANGE(0xb00000, 0xb00007) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0xb00008, 0xb0000f) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_status_r, fdc_ctrl_w) @@ -1050,7 +1050,7 @@ static ADDRESS_MAP_START( system24_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_READWRITE(sys24_mixer_r, sys24_mixer_w) AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_READWRITE(sys24_sprite_r, sys24_sprite_w) AM_RANGE(0x800000, 0x80007f) AM_MIRROR(0x1ffe00) AM_READWRITE(system24temp_sys16_io_r, system24temp_sys16_io_w) - AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0xa00000, 0xa00007) AM_MIRROR(0x0ffff8) AM_READWRITE(irq_r, irq_w) AM_RANGE(0xb00000, 0xb00007) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0xb00008, 0xb0000f) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_status_r, fdc_ctrl_w) diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 22349d31131..be8316c7ec3 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -1236,16 +1236,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( system32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE(SOUND, "rf", rf5c68_w) - AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE(SOUND, "rf", rf5c68_mem_r, rf5c68_mem_w) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rf", rf5c68_w) + AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rf", rf5c68_mem_r, rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&z80_shared_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( system32_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE(SOUND, "ym1", ym3438_r, ym3438_w) - AM_RANGE(0x90, 0x93) AM_MIRROR(0x0c) AM_DEVREADWRITE(SOUND, "ym2", ym3438_r, ym3438_w) + AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym1", ym3438_r, ym3438_w) + AM_RANGE(0x90, 0x93) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym2", ym3438_r, ym3438_w) AM_RANGE(0xa0, 0xaf) AM_WRITE(sound_bank_lo_w) AM_RANGE(0xb0, 0xbf) AM_WRITE(sound_bank_hi_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(sound_int_control_lo_w) @@ -1257,16 +1257,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( multi32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE(SOUND, "sega", multipcm_r, multipcm_w) + AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("sega", multipcm_r, multipcm_w) AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&z80_shared_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( multi32_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE(SOUND, "ym", ym3438_r, ym3438_w) + AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym", ym3438_r, ym3438_w) AM_RANGE(0xa0, 0xaf) AM_WRITE(sound_bank_lo_w) - AM_RANGE(0xb0, 0xbf) AM_DEVWRITE(SOUND, "sega", multipcm_bank_w) + AM_RANGE(0xb0, 0xbf) AM_DEVWRITE("sega", multipcm_bank_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(sound_int_control_lo_w) AM_RANGE(0xd0, 0xd3) AM_MIRROR(0x04) AM_WRITE(sound_int_control_hi_w) AM_RANGE(0xf1, 0xf1) AM_READWRITE(sound_dummy_r, sound_dummy_w) @@ -3940,7 +3940,7 @@ static DRIVER_INIT( radr ) static DRIVER_INIT( scross ) { - const device_config *multipcm = devtag_get_device(machine, SOUND, "sega"); + const device_config *multipcm = devtag_get_device(machine, "sega"); segas32_common_init(analog_custom_io_r, analog_custom_io_w, NULL); memory_install_write8_device_handler(cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_PROGRAM), multipcm, 0xb0, 0xbf, 0, 0, scross_bank_w); } diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index f53b72ef097..c4cba276e6c 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -786,14 +786,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xefff) AM_ROM - AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE(SOUND, "pcm", sega_pcm_r, sega_pcm_w) + AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index a19e3392cd3..ef6525efc0f 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -453,14 +453,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xefff) AM_ROM - AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE(SOUND, "pcm", sega_pcm_r, sega_pcm_w) + AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index f0d968d2864..fc8c6b7b5e6 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -851,7 +851,7 @@ static WRITE32_HANDLER( ds2404_clk_w ) static WRITE32_HANDLER( eeprom_w ) { - const device_config *oki2 = devtag_get_device(space->machine, SOUND, "oki2"); + const device_config *oki2 = devtag_get_device(space->machine, "oki2"); // tile banks if( ACCESSING_BITS_16_23 ) { @@ -1024,7 +1024,7 @@ static ADDRESS_MAP_START( spisound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x400b, 0x400b) AM_WRITENOP /* Unknown */ AM_RANGE(0x4013, 0x4013) AM_READ(z80_coin_r) AM_RANGE(0x401b, 0x401b) AM_WRITE(z80_bank_w) /* control register: bits 0-2 = bank @ 8000, bit 3 = watchdog? */ - AM_RANGE(0x6000, 0x600f) AM_DEVREADWRITE(SOUND, "ymf", ymf271_r, ymf271_w) + AM_RANGE(0x6000, 0x600f) AM_DEVREADWRITE("ymf", ymf271_r, ymf271_w) AM_RANGE(0x8000, 0xffff) AM_ROMBANK(4) ADDRESS_MAP_END @@ -1090,8 +1090,8 @@ static ADDRESS_MAP_START( seibu386_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x0000068c, 0x0000068f) AM_WRITE(eeprom_w) AM_RANGE(0x00000800, 0x0003ffff) AM_RAM AM_BASE(&spimainram) AM_RANGE(0x00200000, 0x003fffff) AM_ROM AM_SHARE(2) - AM_RANGE(0x01200000, 0x01200003) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x000000ff) - AM_RANGE(0x01200004, 0x01200007) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x01200000, 0x01200003) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x01200004, 0x01200007) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x000000ff) AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION("user1", 0) AM_SHARE(2) /* ROM location in real-mode */ ADDRESS_MAP_END diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index 3c62c72802e..738c2592b10 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -133,15 +133,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x08) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x04, 0x04) AM_MIRROR(0x08) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_MIRROR(0x08) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x04, 0x04) AM_MIRROR(0x08) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_nvram_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(&nvram) AM_SIZE(&nvram_size) - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x8000, 0xf7ff) AM_ROM AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE(1) ADDRESS_MAP_END @@ -151,7 +151,7 @@ static ADDRESS_MAP_START( mcu_no_nvram_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW1") /* DSW1 */ AM_RANGE(0x1005, 0x1005) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE(0x1006, 0x1006) AM_READ_PORT("DSW3") /* DSW3 */ - AM_RANGE(0x2000, 0x2000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x8000, 0xf7ff) AM_ROM AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE(1) ADDRESS_MAP_END diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index d231a9f6cf1..6363556f62f 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -164,7 +164,7 @@ AM_RANGE(0x9e00, 0x9e3f) AM_WRITE(SMH_RAM) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(senjyo_bg1videoram_w) AM_BASE(&senjyo_bg1videoram) 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_DEVWRITE(Z80PIO, "z80pio", z80pio_p_w) + AM_RANGE(0xd004, 0xd004) AM_DEVWRITE("z80pio", z80pio_p_w) ADDRESS_MAP_END @@ -176,9 +176,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(senjyo_volume_w) #if 0 AM_RANGE(0xe000, 0xe000) AM_WRITE(unknown) @@ -222,7 +222,7 @@ static ADDRESS_MAP_START( starforb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(senjyo_bg1videoram_w) AM_BASE(&senjyo_bg1videoram) 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_DEVWRITE(Z80PIO, "z80pio", z80pio_p_w) + AM_RANGE(0xd004, 0xd004) AM_DEVWRITE("z80pio", z80pio_p_w) /* these aren't used / written, left here to make sure memory is allocated */ AM_RANGE(0xfe00, 0xfe1f) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_fgscroll) @@ -241,9 +241,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( starforb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(senjyo_volume_w) #if 0 AM_RANGE(0xe000, 0xe000) AM_WRITE(unknown) @@ -268,8 +268,8 @@ static READ8_DEVICE_HANDLER( pio_r ) static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80PIO, "z80pio", pio_r, pio_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(Z80CTC, "z80ctc", z80ctc_r, z80ctc_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("z80pio", pio_r, pio_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("z80ctc", z80ctc_r, z80ctc_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 86c91afd4e7..c7c2bdba246 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1622,7 +1622,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( downtown_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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(SMH_RAM ) // Palette @@ -1636,7 +1636,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( downtown_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_WRITE(SMH_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -1827,7 +1827,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atehate_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x900000, 0x9fffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y @@ -1841,7 +1841,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atehate_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x900000, 0x9fffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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) @@ -1877,7 +1877,7 @@ static ADDRESS_MAP_START( blandia_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( blandia_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1898,7 +1898,7 @@ static ADDRESS_MAP_START( blandia_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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(SMH_RAM ) // (jjsquawk) - AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -1932,7 +1932,7 @@ static ADDRESS_MAP_START( blandiap_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( blandiap_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1953,7 +1953,7 @@ static ADDRESS_MAP_START( blandiap_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -2030,7 +2030,7 @@ static ADDRESS_MAP_START( wrofaero_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( wrofaero_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2051,7 +2051,7 @@ static ADDRESS_MAP_START( wrofaero_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w ) // ? #else @@ -2078,7 +2078,7 @@ static ADDRESS_MAP_START( jjsquawb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa0a000, 0xa0a607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // RZ: Sprites Y AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 AM_RANGE(0xb0c000, 0xb0ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // RZ: Sprites Code + X + Attr - AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w ) // ? #else @@ -2104,7 +2104,7 @@ static ADDRESS_MAP_START( orbs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -2117,7 +2117,7 @@ static ADDRESS_MAP_START( orbs_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -2139,7 +2139,7 @@ static ADDRESS_MAP_START( blockcar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -2154,7 +2154,7 @@ static ADDRESS_MAP_START( blockcar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -2188,7 +2188,7 @@ static ADDRESS_MAP_START( daioh_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( daioh_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2208,7 +2208,7 @@ static ADDRESS_MAP_START( daioh_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) // ADDRESS_MAP_END @@ -2221,7 +2221,7 @@ static ADDRESS_MAP_START( drgnunit_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM @@ -2239,7 +2239,7 @@ static ADDRESS_MAP_START( drgnunit_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -2280,7 +2280,7 @@ static ADDRESS_MAP_START( extdwnhl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xe00000, 0xe03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( extdwnhl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2303,7 +2303,7 @@ static ADDRESS_MAP_START( extdwnhl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xe00000, 0xe03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound ADDRESS_MAP_END /*************************************************************************** @@ -2330,7 +2330,7 @@ static ADDRESS_MAP_START( kamenrid_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( kamenrid_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2357,7 +2357,7 @@ static ADDRESS_MAP_START( kamenrid_writemem, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITE(SMH_NOP ) // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound ADDRESS_MAP_END /* almast identical to kamenrid */ @@ -2375,7 +2375,7 @@ static ADDRESS_MAP_START( madshark_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( madshark_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2397,7 +2397,7 @@ static ADDRESS_MAP_START( madshark_writemem, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0xc00000, 0xc00007) AM_WRITE(SMH_NOP ) // ? #endif - AM_RANGE(0xd00000, 0xd03fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xd00000, 0xd03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound ADDRESS_MAP_END @@ -2442,7 +2442,7 @@ static ADDRESS_MAP_START( krzybowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -2455,7 +2455,7 @@ static ADDRESS_MAP_START( krzybowl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -2495,7 +2495,7 @@ static ADDRESS_MAP_START( msgundam_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( msgundam_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2517,7 +2517,7 @@ static ADDRESS_MAP_START( msgundam_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa80000, 0xa83fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w ) // ? #else @@ -2542,7 +2542,7 @@ static ADDRESS_MAP_START( oisipuzl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins - AM_RANGE(0x700000, 0x703fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0x700000, 0x703fff) AM_DEVREAD("x1", seta_sound_word_r ) // 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 @@ -2559,7 +2559,7 @@ static ADDRESS_MAP_START( oisipuzl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0x700000, 0x703fff) AM_DEVWRITE("x1", 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(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl @@ -2584,7 +2584,7 @@ static ADDRESS_MAP_START( triplfun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins - AM_RANGE(0x500006, 0x500007) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) // tfun sound + AM_RANGE(0x500006, 0x500007) AM_DEVREAD8("oki", okim6295_r, 0x00ff) // tfun sound 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 @@ -2602,7 +2602,7 @@ static ADDRESS_MAP_START( triplfun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) // tfun sound + AM_RANGE(0x500006, 0x500007) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) // tfun 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 @@ -2661,7 +2661,7 @@ static ADDRESS_MAP_START( kiwame_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /**/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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", 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 @@ -2674,7 +2674,7 @@ static ADDRESS_MAP_START( kiwame_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound ADDRESS_MAP_END @@ -2697,7 +2697,7 @@ static WRITE16_HANDLER( thunderl_protection_w ) static ADDRESS_MAP_START( thunderl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1 @@ -2715,7 +2715,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( thunderl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0x100000, 0x103fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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) @@ -2779,14 +2779,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wiggie_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END /*************************************************************************** @@ -2805,7 +2805,7 @@ static ADDRESS_MAP_START( umanclub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( umanclub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2819,7 +2819,7 @@ static ADDRESS_MAP_START( umanclub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xc00000, 0xc03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound ADDRESS_MAP_END /*************************************************************************** @@ -2903,7 +2903,7 @@ static ADDRESS_MAP_START( tndrcade_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1") // P1 AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2") // P2 AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS") // Coins - AM_RANGE(0x2000, 0x2001) AM_DEVREAD(SOUND, "ym1", ym2203_r ) + AM_RANGE(0x2000, 0x2001) AM_DEVREAD("ym1", ym2203_r ) 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 @@ -2913,8 +2913,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tndrcade_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x2001) AM_DEVWRITE(SOUND, "ym1", ym2203_w ) - AM_RANGE(0x3000, 0x3000) AM_DEVWRITE(SOUND, "ym2", ym3812_w ) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_w ) + AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("ym2", ym3812_w ) 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 @@ -3007,14 +3007,14 @@ static WRITE8_HANDLER( calibr50_soundlatch2_w ) } static ADDRESS_MAP_START( calibr50_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_DEVREAD(SOUND, "x1", seta_sound_r ) // Sound + AM_RANGE(0x0000, 0x1fff) AM_DEVREAD("x1", seta_sound_r ) // Sound AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r ) // From Main CPU 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_DEVWRITE(SOUND, "x1", seta_sound_w ) // Sound + AM_RANGE(0x0000, 0x1fff) AM_DEVWRITE("x1", seta_sound_w ) // Sound AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_bankswitch_w ) // Bankswitching AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_WRITE(calibr50_soundlatch2_w ) // To Main CPU @@ -3056,17 +3056,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) - AM_RANGE(0xf000, 0xffff) AM_DEVREAD(SOUND, "x1", seta_sound_r) + AM_RANGE(0xf000, 0xffff) AM_DEVREAD("x1", seta_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf000, 0xffff) AM_DEVWRITE(SOUND, "x1", seta_sound_w) + AM_RANGE(0xf000, 0xffff) AM_DEVWRITE("x1", seta_sound_w) ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym3438_r, ym3438_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym3438_r, ym3438_w) AM_RANGE(0x80, 0x80) AM_WRITE(SMH_NOP) //? AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -3101,7 +3101,7 @@ static ADDRESS_MAP_START( pairlove_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x900000, 0x9001ff) AM_READ(pairlove_prot_r) - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -3115,7 +3115,7 @@ static ADDRESS_MAP_START( pairlove_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -3138,8 +3138,8 @@ static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x620000, 0x620003) AM_WRITENOP // protection AM_RANGE(0x630000, 0x630003) AM_READ(seta_dsw_r) AM_RANGE(0x640400, 0x640fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x650000, 0x650003) AM_DEVWRITE8(SOUND, "ym", ym3812_w, 0x00ff) - AM_RANGE(0x658000, 0x658001) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x650000, 0x650003) AM_DEVWRITE8("ym", ym3812_w, 0x00ff) + AM_RANGE(0x658000, 0x658001) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) AM_RANGE(0x670000, 0x670001) AM_READNOP // watchdog? AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2) // VRAM 2 AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0) // VRAM 0 @@ -3201,9 +3201,9 @@ static ADDRESS_MAP_START( inttoote_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x700101) AM_READWRITE(inttoote_700000_r,SMH_RAM) AM_BASE(&inttoote_700000) - AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE8(MSM6242, "rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC + AM_RANGE(0x800000, 0x80001f) AM_DEVREADWRITE8("rtc", msm6242_r, msm6242_w, 0x00ff) // 6242RTC - AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE( SOUND, "x1", seta_sound_word_r, seta_sound_word_w ) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE( "x1", seta_sound_word_r, seta_sound_word_w ) // Sound 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 diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 2c2998d4dd6..d91f60961ee 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -566,7 +566,7 @@ static ADDRESS_MAP_START( grdians_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P2") // P2 AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x70000c, 0x70000d) AM_READ(watchdog_reset16_r ) // Watchdog - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -577,7 +577,7 @@ static ADDRESS_MAP_START( grdians_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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(SMH_RAM ) // cleared @@ -637,7 +637,7 @@ static ADDRESS_MAP_START( gundamex_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x700008, 0x700009) AM_READ_PORT("IN0") // P1 AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("IN1") // P2 - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound AM_RANGE(0xfffd0a, 0xfffd0b) AM_READ(gundamex_eeprom_r ) // parallel data register ADDRESS_MAP_END @@ -647,7 +647,7 @@ static ADDRESS_MAP_START( gundamex_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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(SMH_RAM ) // cleared @@ -691,7 +691,7 @@ static ADDRESS_MAP_START( mj4simai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600100, 0x600101) AM_READ_PORT("SYSTEM") // AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -703,7 +703,7 @@ static ADDRESS_MAP_START( mj4simai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600004, 0x600005) AM_WRITE(mj4simai_keyboard_w ) // select keyboard row to read 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -724,7 +724,7 @@ static ADDRESS_MAP_START( myangel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700006, 0x700007) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x700300, 0x700301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x700302, 0x700303) AM_READ_PORT("DSW2") // DSW 2 - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -735,7 +735,7 @@ static ADDRESS_MAP_START( myangel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -756,7 +756,7 @@ static ADDRESS_MAP_START( myangel2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 - AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound 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 @@ -767,7 +767,7 @@ static ADDRESS_MAP_START( myangel2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xb00000, 0xb03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound 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 @@ -813,7 +813,7 @@ static ADDRESS_MAP_START( pzlbowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection AM_RANGE(0x800000, 0x83ffff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0x840000, 0x84ffff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0x900000, 0x903fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END @@ -825,7 +825,7 @@ static ADDRESS_MAP_START( pzlbowl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0x900000, 0x903fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers ADDRESS_MAP_END @@ -848,7 +848,7 @@ static ADDRESS_MAP_START( penbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection AM_RANGE(0xb00000, 0xb3ffff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0xb40000, 0xb4ffff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD(SOUND, "x1", seta_sound_word_r ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREAD("x1", seta_sound_word_r ) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END @@ -862,7 +862,7 @@ static ADDRESS_MAP_START( penbros_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "x1", seta_sound_word_w ) // Sound + AM_RANGE(0xa00000, 0xa03fff) AM_DEVWRITE("x1", seta_sound_word_w ) // Sound AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers ADDRESS_MAP_END @@ -916,7 +916,7 @@ static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x840000, 0x84ffff ) AM_RAM_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_DEVREADWRITE( SOUND, "x1", seta_sound_word_r, seta_sound_word_w ) // Sound + AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE( "x1", seta_sound_word_r, seta_sound_word_w ) // Sound AM_RANGE( 0xfffd0a, 0xfffd0b ) AM_READ_PORT("DSW2") // parallel data register (DSW 2) AM_RANGE( 0xfffc00, 0xffffff ) AM_READWRITE( SMH_RAM, tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 24f8ae780fd..227e34f4d37 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -254,13 +254,13 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0xe000, 0xe001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xe000, 0xe001) AM_DEVREAD("ym", ym2151_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym", ym2151_w) ADDRESS_MAP_END @@ -277,8 +277,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound2_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "msm1", msm5205_w) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "msm2", msm5205_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("msm1", msm5205_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm2", msm5205_w) AM_RANGE(0x01, 0x01) AM_READ(soundlatch_r) AM_RANGE(0x02, 0x02) AM_WRITE(sound2_bank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 0882a0c3c12..df85a440507 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -465,7 +465,7 @@ static ADDRESS_MAP_START( sfbonus_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0438, 0x0438) AM_READ_PORT("IN3") - AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x0c00, 0x0c03) AM_WRITE( paletteram_io_w ) diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index ac5ed71fc0d..6f11890f095 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -319,7 +319,7 @@ static ADDRESS_MAP_START (main_io, ADDRESS_SPACE_IO, 8) AM_RANGE( 0x99, 0x99) AM_READWRITE( v9938_0_status_r, v9938_0_command_w ) AM_RANGE( 0x9a, 0x9a) AM_WRITE( v9938_0_palette_w ) AM_RANGE( 0x9b, 0x9b) AM_WRITE( v9938_0_register_w ) - AM_RANGE( 0xa8, 0xab) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE( 0xa8, 0xab) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -330,7 +330,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START (sound_io, ADDRESS_SPACE_IO, 8) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x04, 0x05) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) + AM_RANGE(0x04, 0x05) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER ( ppi_port_c_w ) diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index 8d6e0c58f65..771f8b7f4ca 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -132,10 +132,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("sn", sn76496_w) AM_RANGE(0xbe, 0xbe) AM_READWRITE(TMS9928A_vram_r, TMS9928A_vram_w) AM_RANGE(0xbf, 0xbf) AM_READWRITE(TMS9928A_register_r, TMS9928A_register_w) - AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index abfb71012d2..e078b6206db 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -357,10 +357,10 @@ static WRITE8_DEVICE_HANDLER( oki_bankswitch_w ) static ADDRESS_MAP_START( shadfrce_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("oki", oki_bankswitch_w) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index e539db03ca0..8cc1a81cff2 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -91,7 +91,7 @@ static WRITE16_HANDLER( heberpop_coinctrl_w ) if (ACCESSING_BITS_0_7) { /* the sound ROM bank is selected by the main CPU! */ - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"),(data & 0x08) ? 0x40000 : 0x00000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"),(data & 0x08) ? 0x40000 : 0x00000); coin_lockout_w(0,~data & 0x04); coin_lockout_w(1,~data & 0x04); @@ -105,7 +105,7 @@ static WRITE16_HANDLER( blocken_coinctrl_w ) if (ACCESSING_BITS_0_7) { /* the sound ROM bank is selected by the main CPU! */ - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), ((data >> 4) & 3) * 0x40000); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), ((data >> 4) & 3) * 0x40000); coin_lockout_w(0,~data & 0x04); coin_lockout_w(1,~data & 0x04); @@ -131,9 +131,9 @@ static ADDRESS_MAP_START( shangha3_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS") AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM") - AM_RANGE(0x20001e, 0x20001f) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) + AM_RANGE(0x20001e, 0x20001f) AM_DEVREAD8("ay", ay8910_r, 0x00ff) AM_RANGE(0x20004e, 0x20004f) AM_READ(shangha3_prot_r) - AM_RANGE(0x20006e, 0x20006f) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff) + AM_RANGE(0x20006e, 0x20006f) AM_DEVREAD8("oki", okim6295_r, 0x00ff) AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -143,10 +143,10 @@ static ADDRESS_MAP_START( shangha3_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w) AM_RANGE(0x20000a, 0x20000b) AM_WRITE(SMH_NOP) /* irq ack? */ AM_RANGE(0x20000c, 0x20000d) AM_WRITE(shangha3_coinctrl_w) - AM_RANGE(0x20002e, 0x20002f) AM_DEVWRITE8(SOUND, "ay", ay8910_data_w, 0x00ff) - AM_RANGE(0x20003e, 0x20003f) AM_DEVWRITE8(SOUND, "ay", ay8910_address_w, 0x00ff) + AM_RANGE(0x20002e, 0x20002f) AM_DEVWRITE8("ay", ay8910_data_w, 0x00ff) + AM_RANGE(0x20003e, 0x20003f) AM_DEVWRITE8("ay", ay8910_address_w, 0x00ff) AM_RANGE(0x20004e, 0x20004f) AM_WRITE(shangha3_prot_w) - AM_RANGE(0x20006e, 0x20006f) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) + AM_RANGE(0x20006e, 0x20006f) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) 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) @@ -211,8 +211,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym3438_r, ym3438_w) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym3438_r, ym3438_w) + AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index e5e095627c1..79238a84f0c 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -136,7 +136,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shanghai_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x00, 0x01) AM_READWRITE(HD63484_status_r, HD63484_address_w) AM_RANGE(0x02, 0x03) AM_READWRITE(HD63484_data_r, HD63484_data_w) - AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8(SOUND, "ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x40, 0x41) AM_READ_PORT("P1") AM_RANGE(0x44, 0x45) AM_READ_PORT("P2") AM_RANGE(0x48, 0x49) AM_READ_PORT("SYSTEM") @@ -150,7 +150,7 @@ static ADDRESS_MAP_START( shangha2_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x20, 0x21) AM_READ_PORT("SYSTEM") AM_RANGE(0x30, 0x31) AM_READWRITE(HD63484_status_r, HD63484_address_w) AM_RANGE(0x32, 0x33) AM_READWRITE(HD63484_data_r, HD63484_data_w) - AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8(SOUND, "ym", ym2203_r, ym2203_w, 0x00ff) + AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("ym", ym2203_r, ym2203_w, 0x00ff) AM_RANGE(0x50, 0x51) AM_WRITE(shanghai_coin_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 0424e17976f..77a0fd85ba1 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -324,12 +324,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chinhero_bbx_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( shangkid_bbx_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END /***************************************************************************************/ @@ -346,7 +346,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(shangkid_soundlatch_r) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x00, 0x00) AM_READ(shangkid_soundlatch_r) AM_DEVWRITE("dac", dac_w) ADDRESS_MAP_END /***************************************************************************************/ @@ -463,7 +463,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dynamski_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) /* ports are reversed */ - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static MACHINE_DRIVER_START( dynamski ) diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c index 9c2f1eb69cd..500ccdccfca 100644 --- a/src/mame/drivers/shaolins.c +++ b/src/mame/drivers/shaolins.c @@ -54,8 +54,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(shaolins_nmi_w) /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */ /* bit 3, bit 4 = coin counters */ AM_RANGE(0x0100, 0x0100) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x0300, 0x0300) AM_DEVWRITE(SOUND, "sn1", sn76496_w) /* trigger chip to read from latch. The program always */ - AM_RANGE(0x0400, 0x0400) AM_DEVWRITE(SOUND, "sn2", sn76496_w) /* writes the same number as the latch, so we don't */ + AM_RANGE(0x0300, 0x0300) AM_DEVWRITE("sn1", sn76496_w) /* trigger chip to read from latch. The program always */ + AM_RANGE(0x0400, 0x0400) AM_DEVWRITE("sn2", sn76496_w) /* writes the same number as the latch, so we don't */ /* bother emulating them. */ AM_RANGE(0x0800, 0x0800) AM_WRITE(SMH_NOP) /* latch for 76496 #0 */ AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* latch for 76496 #1 */ diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index 2b370a85089..418442a26bf 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -83,10 +83,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) AM_RANGE(0x80, 0x81) AM_WRITE(shisen_sample_addr_w) - AM_RANGE(0x82, 0x82) AM_DEVWRITE(SOUND, "dac", m72_sample_w) + AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w) AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index d2dc6af7aa0..df127436d75 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -108,7 +108,7 @@ static ADDRESS_MAP_START( readmem_alt, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1002, 0x1002) AM_READ_PORT("P2") AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW2") AM_RANGE(0x2000, 0x21ff) AM_READ(SMH_RAM) - AM_RANGE(0x2800, 0x2801) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x2800, 0x2801) AM_DEVREAD("ym", ym2203_r) 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) @@ -119,7 +119,7 @@ static ADDRESS_MAP_START( writemem_alt, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1800) AM_WRITE(shootout_coin_counter_w) AM_RANGE(0x2000, 0x21ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2800, 0x2801) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ym", ym2203_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(SMH_ROM) @@ -129,14 +129,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) - AM_RANGE(0x4000, 0x4001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) 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(SMH_RAM) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(interrupt_enable_w) 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 9ef1ec9273b..63bb1dcc428 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -278,8 +278,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2") AM_WRITE(shougi_watchdog_reset_w) /* game won't boot if watchdog doesn't work */ - AM_RANGE(0x6000, 0x6000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0x6800, 0x6800) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0x6800, 0x6800) AM_DEVWRITE("ay", ay8910_data_w) AM_RANGE(0x7000, 0x73ff) AM_RAM AM_SHARE(1) /* 2114 x 2 (0x400 x 4bit each) */ AM_RANGE(0x7800, 0x7bff) AM_RAM AM_SHARE(2) /* 2114 x 2 (0x400 x 4bit each) */ diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 15ec6ac0b2f..c7978d89ac0 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -137,7 +137,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x103000, 0x103003) AM_READ(leta_r) AM_RANGE(0x105000, 0x105001) AM_READWRITE(special_port0_r, latch_w) AM_RANGE(0x105002, 0x105003) AM_READ_PORT("BUTTONS") - AM_RANGE(0x106000, 0x106001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x106000, 0x106001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x107000, 0x107007) AM_NOP AM_RANGE(0x3e0000, 0x3e087f) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(shuuz_atarivc_r, shuuz_atarivc_w) AM_BASE(&atarivc_data) diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index dda0c762a7a..6d106fee998 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -149,15 +149,15 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xf002, 0xf003) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xf002, 0xf003) AM_DEVREAD("ym2", ym2203_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xf002, 0xf003) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xf002, 0xf003) AM_DEVWRITE("ym2", ym2203_w) ADDRESS_MAP_END /* Whizz */ @@ -227,7 +227,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( whizz_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index bbbaad0da55..5b72089c261 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -168,8 +168,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ym2", ym3526_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym2", ym3526_w) 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 bf6cf08d44d..2adb6da9c5a 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -146,7 +146,7 @@ static WRITE32_DEVICE_HANDLER(silk_6295_bank_w) { int bank = (data & 0x3000000) >> 24; if(bank < 3) - okim6295_set_bank_base(devtag_get_device(device->machine, SOUND, "oki1"), 0x40000 * (bank)); + okim6295_set_bank_base(devtag_get_device(device->machine, "oki1"), 0x40000 * (bank)); } } @@ -168,10 +168,10 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x808000, 0x80bfff) AM_RAM_WRITE(silkroad_fgram3_w) AM_BASE(&silkroad_vidram3) // higher layer AM_RANGE(0xc00000, 0xc00003) AM_READ_PORT("INPUTS") AM_RANGE(0xc00004, 0xc00007) AM_READ_PORT("DSW") - AM_RANGE(0xc00024, 0xc00027) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff0000) - AM_RANGE(0xc00028, 0xc0002f) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff0000) - AM_RANGE(0xc00030, 0xc00033) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff0000) - AM_RANGE(0xc00034, 0xc00037) AM_DEVWRITE(SOUND, "oki1", silk_6295_bank_w) + AM_RANGE(0xc00024, 0xc00027) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff0000) + AM_RANGE(0xc00028, 0xc0002f) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff0000) + AM_RANGE(0xc00030, 0xc00033) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff0000) + AM_RANGE(0xc00034, 0xc00037) AM_DEVWRITE("oki1", silk_6295_bank_w) AM_RANGE(0xc00038, 0xc0003b) AM_WRITE(silk_coin_counter_w) AM_RANGE(0xc0010c, 0xc00123) AM_WRITE(SMH_RAM) AM_BASE(&silkroad_regs) AM_RANGE(0xfe0000, 0xffffff) AM_RAM diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index b872ecd1ac8..acb7433e226 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -180,7 +180,7 @@ static WRITE32_HANDLER( simpl156_eeprom_w ) okibank = data & 0x07; - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "okimusic"), 0x40000 * (data & 0x7) ); + okim6295_set_bank_base(devtag_get_device(space->machine, "okimusic"), 0x40000 * (data & 0x7) ); eeprom_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); eeprom_write_bit(data & 0x10); @@ -301,8 +301,8 @@ static ADDRESS_MAP_START( joemacr_map, ADDRESS_SPACE_PROGRAM, 32 ) 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_WRITE(SMH_NOP) // ? - AM_RANGE(0x180000, 0x180003) AM_DEVREADWRITE8(SOUND, "okisfx", okim6295_r, okim6295_w, 0x000000ff) - AM_RANGE(0x1c0000, 0x1c0003) AM_DEVREADWRITE8(SOUND, "okimusic", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x180000, 0x180003) AM_DEVREADWRITE8("okisfx", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x1c0000, 0x1c0003) AM_DEVREADWRITE8("okimusic", okim6295_r, okim6295_w, 0x000000ff) 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 @@ -313,7 +313,7 @@ static ADDRESS_MAP_START( chainrec_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // rom (32-bit) AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(&simpl156_systemram) // work ram (32-bit) - AM_RANGE(0x3c0000, 0x3c0003) AM_DEVREADWRITE8(SOUND, "okimusic", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x3c0000, 0x3c0003) AM_DEVREADWRITE8("okimusic", okim6295_r, okim6295_w, 0x000000ff) AM_RANGE(0x400000, 0x407fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE(&simpl156_mainram) // main ram? AM_RANGE(0x410000, 0x411fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x420000, 0x420fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) @@ -325,7 +325,7 @@ static ADDRESS_MAP_START( chainrec_map, ADDRESS_SPACE_PROGRAM, 32 ) 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_WRITE(SMH_NOP) // ?? - AM_RANGE(0x480000, 0x480003) AM_DEVREADWRITE8(SOUND, "okisfx", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x480000, 0x480003) AM_DEVREADWRITE8("okisfx", okim6295_r, okim6295_w, 0x000000ff) ADDRESS_MAP_END @@ -334,7 +334,7 @@ static ADDRESS_MAP_START( magdrop_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(&simpl156_systemram) // work ram (32-bit) - AM_RANGE(0x340000, 0x340003) AM_DEVREADWRITE8(SOUND, "okimusic", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x340000, 0x340003) AM_DEVREADWRITE8("okimusic", okim6295_r, okim6295_w, 0x000000ff) AM_RANGE(0x380000, 0x387fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE(&simpl156_mainram) // main ram? AM_RANGE(0x390000, 0x391fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x3a0000, 0x3a0fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) @@ -346,7 +346,7 @@ static ADDRESS_MAP_START( magdrop_map, ADDRESS_SPACE_PROGRAM, 32 ) 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_WRITE(SMH_NOP) //? - AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8(SOUND, "okisfx", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8("okisfx", okim6295_r, okim6295_w, 0x000000ff) ADDRESS_MAP_END @@ -355,7 +355,7 @@ static ADDRESS_MAP_START( magdropp_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(&simpl156_systemram) // work ram (32-bit) - AM_RANGE(0x4c0000, 0x4c0003) AM_DEVREADWRITE8(SOUND, "okimusic", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x4c0000, 0x4c0003) AM_DEVREADWRITE8("okimusic", okim6295_r, okim6295_w, 0x000000ff) AM_RANGE(0x680000, 0x687fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE(&simpl156_mainram) // main ram? AM_RANGE(0x690000, 0x691fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x6a0000, 0x6a0fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) @@ -367,15 +367,15 @@ static ADDRESS_MAP_START( magdropp_map, ADDRESS_SPACE_PROGRAM, 32 ) 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_WRITE(SMH_NOP) // ? - AM_RANGE(0x780000, 0x780003) AM_DEVREADWRITE8(SOUND, "okisfx", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x780000, 0x780003) AM_DEVREADWRITE8("okisfx", okim6295_r, okim6295_w, 0x000000ff) ADDRESS_MAP_END /* Mitchell MT5601-0 PCB (prtytime, charlien, osman) */ static ADDRESS_MAP_START( mitchell156_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8(SOUND, "okisfx", okim6295_r, okim6295_w, 0x000000ff) - AM_RANGE(0x140000, 0x140003) AM_DEVREADWRITE8(SOUND, "okimusic", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8("okisfx", okim6295_r, okim6295_w, 0x000000ff) + AM_RANGE(0x140000, 0x140003) AM_DEVREADWRITE8("okimusic", okim6295_r, okim6295_w, 0x000000ff) AM_RANGE(0x180000, 0x187fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE(&simpl156_mainram) // main ram AM_RANGE(0x190000, 0x191fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x1a0000, 0x1a0fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 01d7fb7ca15..6ce955c4c61 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -94,7 +94,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fc0, 0x1fc0) AM_WRITE(simpsons_coin_counter_w) AM_RANGE(0x1fc2, 0x1fc2) AM_WRITE(simpsons_eeprom_w) AM_RANGE(0x1fc4, 0x1fc4) AM_READ(simpsons_sound_interrupt_r) - AM_RANGE(0x1fc6, 0x1fc7) AM_DEVREADWRITE(SOUND, "konami", simpsons_sound_r, k053260_w) + AM_RANGE(0x1fc6, 0x1fc7) AM_DEVREADWRITE("konami", simpsons_sound_r, k053260_w) AM_RANGE(0x1fc8, 0x1fc9) AM_READ(K053246_r) AM_RANGE(0x1fca, 0x1fca) AM_READ(watchdog_reset_r) AM_RANGE(0x2000, 0x3fff) AM_RAMBANK(4) @@ -136,9 +136,9 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfe00, 0xfe00) AM_WRITE(z80_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 5cb824615f1..d0af68f7751 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -252,8 +252,8 @@ GFXDECODE_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x06, 0x06) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x06, 0x06) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END static MACHINE_DRIVER_START( skyarmy ) diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c index d50ee69d37c..2c3f9c83864 100644 --- a/src/mame/drivers/skydiver.c +++ b/src/mame/drivers/skydiver.c @@ -147,7 +147,7 @@ static WRITE8_HANDLER( skydiver_nmion_w ) static INTERRUPT_GEN( skydiver_interrupt ) { - const device_config *discrete = devtag_get_device(device->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(device->machine, "discrete"); /* Convert range data to divide value and write to sound */ discrete_sound_w(discrete, SKYDIVER_RANGE_DATA, (0x01 << (~skydiver_videoram[0x394] & 0x07)) & 0xff); // Range 0-2 @@ -197,11 +197,11 @@ static ADDRESS_MAP_START( skydiver_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0806, 0x0807) AM_MIRROR(0x47f0) AM_WRITE(skydiver_start_lamp_2_w) AM_RANGE(0x0808, 0x0809) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_y_w) AM_RANGE(0x080a, 0x080b) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_d_w) - AM_RANGE(0x080c, 0x080d) AM_MIRROR(0x47f0) AM_DEVWRITE(SOUND, "discrete", skydiver_sound_enable_w) + AM_RANGE(0x080c, 0x080d) AM_MIRROR(0x47f0) AM_DEVWRITE("discrete", skydiver_sound_enable_w) // AM_RANGE(0x1000, 0x1001) AM_MIRROR(0x47f0) AM_WRITE(skydiver_jump1_lamps_w) AM_RANGE(0x1002, 0x1003) AM_MIRROR(0x47f0) AM_WRITE(skydiver_coin_lockout_w) // AM_RANGE(0x1006, 0x1007) AM_MIRROR(0x47f0) AM_WRITE(skydiver_jump2_lamps_w) - AM_RANGE(0x1008, 0x100b) AM_MIRROR(0x47f0) AM_DEVWRITE(SOUND, "discrete", skydiver_whistle_w) + AM_RANGE(0x1008, 0x100b) AM_MIRROR(0x47f0) AM_DEVWRITE("discrete", skydiver_whistle_w) AM_RANGE(0x100c, 0x100d) AM_MIRROR(0x47f0) AM_WRITE(skydiver_nmion_w) AM_RANGE(0x100e, 0x100f) AM_MIRROR(0x47f0) AM_WRITE(skydiver_width_w) AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x47e0) AM_READ_PORT("IN0") diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 0a529211d81..fded2f8df9d 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -88,8 +88,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( skyfox_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREAD(SOUND, "ym1", ym2203_r) // YM2203 #1 -// AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym2", ym2203_r ) // YM2203 #2 + AM_RANGE(0xa000, 0xa001) AM_DEVREAD("ym1", ym2203_r) // YM2203 #1 +// AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym2", ym2203_r ) // YM2203 #2 AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END @@ -97,9 +97,9 @@ static ADDRESS_MAP_START( skyfox_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xa001) AM_DEVWRITE(SOUND, "ym1", ym2203_w ) // + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym1", ym2203_w ) // // AM_RANGE(0xb000, 0xb001) AM_WRITE(SMH_NOP ) // ?? - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym2", ym2203_w ) // + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym2", ym2203_w ) // ADDRESS_MAP_END diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index a81e3a6417d..9c334b798fb 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -121,7 +121,7 @@ static ADDRESS_MAP_START( skykid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4800, 0x5fff) AM_RAM AM_BASE(&skykid_spriteram) /* RAM + Sprite RAM */ AM_RANGE(0x6000, 0x60ff) AM_WRITE(skykid_scroll_y_w) /* Y scroll register map */ AM_RANGE(0x6200, 0x63ff) AM_WRITE(skykid_scroll_x_w) /* X scroll register map */ - AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata)/* PSG device, shared RAM */ + AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE("namco", 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(SMH_ROM) /* ROM */ @@ -133,7 +133,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x001f) AM_READWRITE(hd63701_internal_registers_r, hd63701_internal_registers_w) AM_RANGE(0x0080, 0x00ff) AM_RAM - AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r, namcos1_cus30_w) AM_BASE(&namco_wavedata) /* PSG device, shared RAM */ + AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", 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(SMH_ROM) diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 53e94c119ac..3f0c24eb87f 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -372,13 +372,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map_skylncr, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0x20, 0x20) AM_WRITE( skylncr_coin_w ) - AM_RANGE(0x30, 0x31) AM_DEVWRITE( SOUND, "ay", ay8910_address_data_w ) - AM_RANGE(0x31, 0x31) AM_DEVREAD( SOUND, "ay", ay8910_r ) + AM_RANGE(0x30, 0x31) AM_DEVWRITE( "ay", ay8910_address_data_w ) + AM_RANGE(0x31, 0x31) AM_DEVREAD( "ay", ay8910_r ) AM_RANGE(0x40, 0x41) AM_WRITE( skylncr_paletteram_w ) AM_RANGE(0x50, 0x51) AM_WRITE( skylncr_paletteram2_w ) diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 733d58a07db..5cffcb23f5a 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -560,26 +560,26 @@ static ADDRESS_MAP_START( perfrman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x8800, 0x880f) AM_READ(slapfight_dpram_r) AM_RANGE(0x8810, 0x8fff) AM_READ(SMH_BANK1) - AM_RANGE(0xa081, 0xa081) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xa091, 0xa091) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0xa081, 0xa081) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xa091, 0xa091) AM_DEVREAD("ay2", ay8910_r) ADDRESS_MAP_END static ADDRESS_MAP_START( perfrman_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8800, 0x880f) AM_WRITE(slapfight_dpram_w) AM_RANGE(0x8810, 0x8fff) AM_WRITE(SMH_BANK1) /* Shared RAM with main CPU */ - AM_RANGE(0xa080, 0xa080) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0xa082, 0xa082) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0xa090, 0xa090) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0xa092, 0xa092) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0xa080, 0xa080) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0xa082, 0xa082) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0xa090, 0xa090) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0xa092, 0xa092) AM_DEVWRITE("ay2", ay8910_data_w) AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */ // 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(SMH_ROM) - AM_RANGE(0xa081, 0xa081) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0xa091, 0xa091) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0xa081, 0xa081) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0xa091, 0xa091) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0xc800, 0xc80f) AM_READ(slapfight_dpram_r) AM_RANGE(0xc810, 0xcfff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) @@ -587,10 +587,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) - AM_RANGE(0xa080, 0xa080) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0xa082, 0xa082) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0xa090, 0xa090) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) - AM_RANGE(0xa092, 0xa092) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0xa080, 0xa080) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0xa082, 0xa082) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0xa090, 0xa090) AM_DEVWRITE("ay2", ay8910_address_w) + AM_RANGE(0xa092, 0xa092) AM_DEVWRITE("ay2", ay8910_data_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(SMH_RAM) diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index c326e33c445..91aca124287 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -286,7 +286,7 @@ static ADDRESS_MAP_START( slapshot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80ffff) AM_READWRITE(TC0480SCP_word_r, TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_READWRITE(TC0480SCP_ctrl_word_r, TC0480SCP_ctrl_word_w) AM_RANGE(0x900000, 0x907fff) AM_READWRITE(color_ram_word_r, color_ram_word_w) AM_BASE(&color_ram) /* 8bpg palette */ - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE8(MK48T08, "mk48t08", timekeeper_r, timekeeper_w, 0xff00) /* nvram (only low bytes used) */ + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE8("mk48t08", timekeeper_r, timekeeper_w, 0xff00) /* nvram (only low bytes used) */ AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_swap_w) /* priority chip */ AM_RANGE(0xc00000, 0xc0000f) AM_READWRITE(TC0640FIO_halfword_byteswap_r, TC0640FIO_halfword_byteswap_w) AM_RANGE(0xc00020, 0xc0002f) AM_READ(slapshot_service_input_r) /* service mirror */ @@ -301,7 +301,7 @@ static ADDRESS_MAP_START( opwolf3_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80ffff) AM_READWRITE(TC0480SCP_word_r, TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_READWRITE(TC0480SCP_ctrl_word_r, TC0480SCP_ctrl_word_w) AM_RANGE(0x900000, 0x907fff) AM_READWRITE(color_ram_word_r, color_ram_word_w) AM_BASE(&color_ram) /* 8bpg palette */ - AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE8(MK48T08, "mk48t08", timekeeper_r, timekeeper_w, 0xff00) /* nvram (only low bytes used) */ + AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE8("mk48t08", timekeeper_r, timekeeper_w, 0xff00) /* nvram (only low bytes used) */ AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_swap_w) /* priority chip */ AM_RANGE(0xc00000, 0xc0000f) AM_READWRITE(TC0640FIO_halfword_byteswap_r, TC0640FIO_halfword_byteswap_w) AM_RANGE(0xc00020, 0xc0002f) AM_READ(slapshot_service_input_r) /* service mirror */ @@ -315,7 +315,7 @@ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -324,7 +324,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan */ diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index d7e3682c912..3c622df7a3b 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -437,7 +437,7 @@ static ADDRESS_MAP_START( soundmem_prg, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( soundmem_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0100, 0x0100) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) + AM_RANGE(0x0100, 0x0100) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE(0x0101, 0x0101) AM_READ(soundlatch_r) /* ports */ AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITE( oki_setbank ) diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c index f26f345cf25..b374e565658 100644 --- a/src/mame/drivers/slotcarn.c +++ b/src/mame/drivers/slotcarn.c @@ -172,20 +172,20 @@ static ADDRESS_MAP_START( slotcarn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7000, 0xafff) AM_ROM // spielbud - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xb100, 0xb100) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xb100, 0xb100) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) - AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xba00, 0xba03) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ - AM_RANGE(0xbc00, 0xbc03) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ + AM_RANGE(0xb800, 0xb803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xba00, 0xba03) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */ + AM_RANGE(0xbc00, 0xbc03) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */ AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW3") AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW4") AM_RANGE(0xd800, 0xd81f) AM_RAM // column scroll for reels? - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xe001, 0xe001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xe001, 0xe001) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&ram_attr) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&ram_video) @@ -194,8 +194,8 @@ ADDRESS_MAP_END // spielbud - is the ay mirrored, or are there now 2? static ADDRESS_MAP_START( spielbud_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xb100, 0xb100) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xb100, 0xb100) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END /******************************** @@ -523,7 +523,7 @@ GFXDECODE_END static VIDEO_UPDATE( slotcarn ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = devtag_get_device(screen->machine, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c index ec06b215bda..2a43af1c510 100644 --- a/src/mame/drivers/sms.c +++ b/src/mame/drivers/sms.c @@ -480,7 +480,7 @@ static PALETTE_INIT( sms ) static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x00800, 0x00803) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x00800, 0x00803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x01000, 0x01007) AM_WRITE(video_w) AM_RANGE(0x01800, 0x01803) AM_READWRITE(link_r, link_w) AM_RANGE(0x04000, 0x07fff) AM_ROMBANK(1) @@ -492,7 +492,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sureshot_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x02000, 0x02007) AM_WRITE(video_w) - AM_RANGE(0x03000, 0x03003) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x03000, 0x03003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x03800, 0x03803) AM_READWRITE(link_r, link_w) AM_RANGE(0x08000, 0x0ffff) AM_ROM AM_RANGE(0xf8000, 0xfffff) AM_ROM // mirror for vectors @@ -501,8 +501,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x27ff) AM_RAM - AM_RANGE(0x3100, 0x3103) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0x3381, 0x3382) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x3100, 0x3103) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x3381, 0x3382) AM_DEVWRITE("ay", ay8910_data_address_w) AM_RANGE(0x3400, 0x3400) AM_READ(z80_8088_r) AM_RANGE(0x3500, 0x3501) AM_READWRITE(p03_r, p03_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 690da7fba80..b6b0d6dc3b1 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -1329,9 +1329,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( marvins_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x4000) AM_READ(marvins_soundlatch_r) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8002, 0x8007) AM_DEVWRITE(SOUND, "wave", snkwave_w) - AM_RANGE(0x8008, 0x8009) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8002, 0x8007) AM_DEVWRITE("wave", snkwave_w) + AM_RANGE(0x8008, 0x8009) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0xa000, 0xa000) AM_READ(marvins_sound_nmi_ack_r) AM_RANGE(0xe000, 0xe7ff) AM_RAM ADDRESS_MAP_END @@ -1347,9 +1347,9 @@ static ADDRESS_MAP_START( jcross_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(sgladiat_soundlatch_r) AM_RANGE(0xc000, 0xc000) AM_READ(sgladiat_sound_nmi_ack_r) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0xe002, 0xe003) AM_WRITENOP // ? always FFFF, snkwave leftover? - AM_RANGE(0xe004, 0xe005) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0xe004, 0xe005) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( jcross_sound_portmap, ADDRESS_SPACE_IO, 8 ) @@ -1363,9 +1363,9 @@ static ADDRESS_MAP_START( hal21_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(sgladiat_soundlatch_r) AM_RANGE(0xc000, 0xc000) AM_READ(sgladiat_sound_nmi_ack_r) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ay1", ay8910_address_data_w) // AM_RANGE(0xe002, 0xe002) AM_WRITENOP // bitfielded(0-5) details unknown. Filter enable? - AM_RANGE(0xe008, 0xe009) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0xe008, 0xe009) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hal21_sound_portmap, ADDRESS_SPACE_IO, 8 ) @@ -1379,7 +1379,7 @@ static ADDRESS_MAP_START( tnk3_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xc000, 0xc000) AM_READ(tnk3_busy_clear_r) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE(SOUND, "ym1", ym3526_r, ym3526_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym1", ym3526_r, ym3526_w) AM_RANGE(0xe004, 0xe004) AM_READ(tnk3_cmdirq_ack_r) AM_RANGE(0xe006, 0xe006) AM_READ(tnk3_ymirq_ack_r) ADDRESS_MAP_END @@ -1389,7 +1389,7 @@ static ADDRESS_MAP_START( aso_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) AM_RANGE(0xe000, 0xe000) AM_READ(tnk3_busy_clear_r) - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE(SOUND, "ym1", ym3526_r, ym3526_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym1", ym3526_r, ym3526_w) // AM_RANGE(0xf002, 0xf002) AM_READNOP unknown AM_RANGE(0xf004, 0xf004) AM_READ(tnk3_cmdirq_ack_r) AM_RANGE(0xf006, 0xf006) AM_READ(tnk3_ymirq_ack_r) @@ -1399,10 +1399,10 @@ static ADDRESS_MAP_START( YM3526_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE(SOUND, "ym1", ym3526_status_port_r, ym3526_control_port_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "ym1", ym3526_write_port_w) - AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE(SOUND, "ym2", ym3526_status_port_r, ym3526_control_port_w) - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "ym2", ym3526_write_port_w) + AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ym1", ym3526_status_port_r, ym3526_control_port_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ym1", ym3526_write_port_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("ym2", ym3526_status_port_r, ym3526_control_port_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("ym2", ym3526_write_port_w) AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w) ADDRESS_MAP_END @@ -1410,8 +1410,8 @@ static ADDRESS_MAP_START( YM3812_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE(SOUND, "ym1", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "ym1", ym3812_write_port_w) + AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ym1", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ym1", ym3812_write_port_w) AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w) ADDRESS_MAP_END @@ -1419,10 +1419,10 @@ static ADDRESS_MAP_START( YM3526_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE(SOUND, "ym1", ym3526_status_port_r, ym3526_control_port_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "ym1", ym3526_write_port_w) - AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE(SOUND, "ym2", y8950_status_port_r, y8950_control_port_w) - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "ym2", y8950_write_port_w) + AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ym1", ym3526_status_port_r, ym3526_control_port_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ym1", ym3526_write_port_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("ym2", y8950_status_port_r, y8950_control_port_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("ym2", y8950_write_port_w) AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w) ADDRESS_MAP_END @@ -1430,10 +1430,10 @@ static ADDRESS_MAP_START( YM3812_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE(SOUND, "ym1", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE(SOUND, "ym1", ym3812_write_port_w) - AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE(SOUND, "ym2", y8950_status_port_r, y8950_control_port_w) - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "ym2", y8950_write_port_w) + AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ym1", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("ym1", ym3812_write_port_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("ym2", y8950_status_port_r, y8950_control_port_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("ym2", y8950_write_port_w) AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w) ADDRESS_MAP_END @@ -1441,8 +1441,8 @@ static ADDRESS_MAP_START( Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE(SOUND, "ym2", y8950_status_port_r, y8950_control_port_w) - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE(SOUND, "ym2", y8950_write_port_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE("ym2", y8950_status_port_r, y8950_control_port_w) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("ym2", y8950_write_port_w) AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 4bb98f2ee6b..d8150683b5f 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -187,10 +187,10 @@ static WRITE8_DEVICE_HANDLER( D7759_upd_reset_w ) static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ym", ym3812_status_port_r, ym3812_control_port_w) - AM_RANGE(0x20, 0x20) AM_DEVWRITE(SOUND, "ym", ym3812_write_port_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "upd", D7759_write_port_0_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "upd", D7759_upd_reset_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ym", ym3812_status_port_r, ym3812_control_port_w) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("ym", ym3812_write_port_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", D7759_write_port_0_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", D7759_upd_reset_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c index 357d423eba1..fd9eb23fddd 100644 --- a/src/mame/drivers/snookr10.c +++ b/src/mame/drivers/snookr10.c @@ -506,7 +506,7 @@ static WRITE8_HANDLER( output_port_1_w ) static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x3000, 0x3000) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("IN2") /* IN2 */ @@ -521,7 +521,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tenballs_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x4000, 0x4000) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x4001, 0x4001) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x4002, 0x4002) AM_READ_PORT("IN2") /* IN2 */ diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index dfc12e72172..e3a7bf266b1 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -111,7 +111,7 @@ static INTERRUPT_GEN( snowbros_interrupt ) static INTERRUPT_GEN( snowbro3_interrupt ) { - const device_config *adpcm = devtag_get_device(device->machine, SOUND, "oki"); + const device_config *adpcm = devtag_get_device(device->machine, "oki"); int status = okim6295_r(adpcm,0); cpu_set_input_line(device, cpu_getiloops(device) + 2, HOLD_LINE); /* IRQs 4, 3, and 2 */ @@ -197,7 +197,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, soundlatch_w) /* goes back to the main CPU, checked during boot */ ADDRESS_MAP_END @@ -255,18 +255,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xe010, 0xe010) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xe010, 0xe010) AM_DEVREAD("oki", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe010, 0xe010) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xe010, 0xe010) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) // not connected? + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) // not connected? AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, soundlatch_w) /* goes back to the main CPU, checked during boot */ ADDRESS_MAP_END @@ -309,13 +309,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( twinadv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) -// AM_RANGE(0xe010, 0xe010) AM_DEVREAD(SOUND, "oki", okim6295_r) +// AM_RANGE(0xe010, 0xe010) AM_DEVREAD("oki", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( twinadv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) -// AM_RANGE(0xe010, 0xe010) AM_DEVWRITE(SOUND, "oki", okim6295_w) +// AM_RANGE(0xe010, 0xe010) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( twinadv_oki_bank_w ) @@ -330,8 +330,8 @@ static WRITE8_DEVICE_HANDLER( twinadv_oki_bank_w ) static ADDRESS_MAP_START( twinadv_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x02) AM_READWRITE(soundlatch_r, soundlatch_w) // back to 68k? - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "oki", twinadv_oki_bank_w) // oki bank? - AM_RANGE(0x06, 0x06) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("oki", twinadv_oki_bank_w) // oki bank? + AM_RANGE(0x06, 0x06) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) ADDRESS_MAP_END @@ -370,15 +370,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyperpac_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xcfff) AM_READ(SMH_ROM) AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) - AM_RANGE(0xf000, 0xf001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym", ym2151_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(SMH_ROM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0xf002, 0xf002) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0xf002, 0xf002) AM_DEVWRITE("oki", okim6295_w) // AM_RANGE(0xf006, 0xf006) ??? ADDRESS_MAP_END @@ -504,7 +504,7 @@ static ADDRESS_MAP_START( writemem3, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "oki", sb3_sound_w) // ? + AM_RANGE( 0x300000, 0x300001) AM_DEVWRITE("oki", 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(SMH_RAM) AM_BASE( &spriteram16) AM_SIZE( &spriteram_size ) diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index da8166827ee..d8dd0a90dde 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -80,9 +80,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x11) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x20, 0x21) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x30, 0x31) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x20, 0x21) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x30, 0x31) AM_DEVWRITE("ay3", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index 1d9ae2c9488..65eb76c511e 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -99,8 +99,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index e0f4ed289bd..0a92e54a073 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( maincpu_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x33, 0x33) AM_READ(soundcpu_status_r) AM_RANGE( 0x40, 0x4f) AM_WRITE(soundlatch_w) AM_RANGE( 0x50, 0x50) AM_WRITE(bank_w) - AM_RANGE( 0x60, 0x61) AM_MIRROR(0x02) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE( 0x60, 0x61) AM_MIRROR(0x02) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* not sure, but the A1 line is ignored, code @ $8b8 */ AM_RANGE( 0x70, 0x70) AM_WRITE( v9938_0_vram_w ) AM_READ( v9938_0_vram_r ) AM_RANGE( 0x71, 0x71) AM_WRITE( v9938_0_command_w ) AM_READ( v9938_0_status_r ) @@ -177,7 +177,7 @@ static ADDRESS_MAP_START( soundcpu_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_RANGE(0x01, 0x01) AM_WRITE(msm_data_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "msm", msm_cfg_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("msm", msm_cfg_w) AM_RANGE(0x03, 0x03) AM_WRITE(soundcpu_busyflag_set_w) AM_RANGE(0x04, 0x04) AM_WRITE(soundcpu_busyflag_reset_w) AM_RANGE(0x05, 0x05) AM_WRITE(soundcpu_int_clear_w) diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c index ad398cf8044..b409f80e13e 100644 --- a/src/mame/drivers/spacefb.c +++ b/src/mame/drivers/spacefb.c @@ -229,7 +229,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spacefb_audio_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(spacefb_audio_p2_r) AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(spacefb_audio_t0_r) AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(spacefb_audio_t1_r) diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index 3fcb14a5ae8..b163ef5754e 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -203,7 +203,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) - AM_RANGE(0xf800, 0xf800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xf800, 0xf800) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* irq ack ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -211,8 +211,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf800, 0xf800) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xf810, 0xf811) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xf800, 0xf800) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xf810, 0xf811) AM_DEVWRITE("ym", ym3812_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* irq ack ?? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index 90668d0312a..53de19ffd63 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -60,9 +60,9 @@ static WRITE8_HANDLER( spcforce_SN76496_select_w ) { spcforce_SN76496_select = data; - if (~data & 0x40) sn76496_w(devtag_get_device(space->machine, SOUND, "sn1"), 0, spcforce_SN76496_latch); - if (~data & 0x20) sn76496_w(devtag_get_device(space->machine, SOUND, "sn2"), 0, spcforce_SN76496_latch); - if (~data & 0x10) sn76496_w(devtag_get_device(space->machine, SOUND, "sn3"), 0, spcforce_SN76496_latch); + if (~data & 0x40) sn76496_w(devtag_get_device(space->machine, "sn1"), 0, spcforce_SN76496_latch); + if (~data & 0x20) sn76496_w(devtag_get_device(space->machine, "sn2"), 0, spcforce_SN76496_latch); + if (~data & 0x10) sn76496_w(devtag_get_device(space->machine, "sn3"), 0, spcforce_SN76496_latch); } static READ8_HANDLER( spcforce_t0_r ) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 8608594952b..3417149d206 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -61,7 +61,7 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( spd_adpcm_w ) { int chip = offset & 1; - const device_config *adpcm = devtag_get_device(space->machine, SOUND, (chip == 0) ? "msm1" : "msm2"); + const device_config *adpcm = devtag_get_device(space->machine, (chip == 0) ? "msm1" : "msm2"); switch (offset/2) { @@ -300,7 +300,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2800, 0x2801) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ym", ym3812_w) AM_RANGE(0x3800, 0x3807) AM_WRITE(spd_adpcm_w) 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 e32d0a222b7..8c69f48d6a4 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -186,7 +186,7 @@ static ADDRESS_MAP_START( speedatk_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x01) AM_WRITE(speedatk_videoregs_w) // HD46505SP video registers AM_RANGE(0x24, 0x24) AM_WRITE(SMH_NOP) //video timing AM_RANGE(0x40, 0x40) AM_READ_PORT("DSW") /* likely ay8910 input port, not direct */ - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) /*Used only during attract mode,unknown meaning.*/ AM_RANGE(0x60, 0x60) AM_READWRITE(SMH_NOP,SMH_NOP)//write the result to $62/$65 AM_RANGE(0x61, 0x61) AM_READ(SMH_NOP)//write the result to $66 diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c index 57d59b11bf3..31cd2185de5 100644 --- a/src/mame/drivers/speedbal.c +++ b/src/mame/drivers/speedbal.c @@ -101,7 +101,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x40, 0x40) AM_WRITENOP AM_RANGE(0x80, 0x80) AM_WRITENOP AM_RANGE(0x82, 0x82) AM_WRITENOP diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index fcdf4365c9d..04cfdc7294e 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -155,15 +155,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE(SOUND, "oki", oki_banking_w) - AM_RANGE(0x9800, 0x9800) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", oki_banking_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END /*** INPUT PORT **************************************************************/ diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index 56cc9e7a1d1..7a39b6c55d1 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -122,7 +122,7 @@ static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xe87f) AM_RAM - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE(SOUND, "st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(&shared) diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index cde1828a361..23c12a74369 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -231,9 +231,9 @@ static READ8_DEVICE_HANDLER( gfx_rom_r ); static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - const device_config *pia1 = devtag_get_device(device->machine, PIA6821, "pia1"); - const device_config *pia2 = devtag_get_device(device->machine, PIA6821, "pia2"); - const device_config *pia3 = devtag_get_device(device->machine, PIA6821, "pia3"); + const device_config *pia1 = devtag_get_device(device->machine, "pia1"); + const device_config *pia2 = devtag_get_device(device->machine, "pia2"); + const device_config *pia3 = devtag_get_device(device->machine, "pia3"); int combined_state = pianew_get_irq_a(pia1) | pianew_get_irq_b(pia1) | pianew_get_irq_b(pia2) | pianew_get_irq_a(pia3) | pianew_get_irq_b(pia3); @@ -279,7 +279,7 @@ static const pia6821_interface pia_1_intf = static INTERRUPT_GEN( update_pia_1 ) { - const device_config *pia1 = devtag_get_device(device->machine, PIA6821, "pia1"); + const device_config *pia1 = devtag_get_device(device->machine, "pia1"); /* update the different PIA pins from the input ports */ /* CA1 - copy of PA1 (COIN1) */ @@ -334,8 +334,8 @@ static const pia6821_interface pia_3_intf = DEVCB_NULL, /* line CB1 in */ DEVCB_NULL, /* line CA2 in */ DEVCB_NULL, /* line CB2 in */ - DEVCB_DEVICE_HANDLER(SOUND, "discrete", spiders_audio_ctrl_w), /* port A out */ - DEVCB_DEVICE_HANDLER(PIA6821, "pia4", spiders_audio_command_w), /* port B out */ + DEVCB_DEVICE_HANDLER("discrete", spiders_audio_ctrl_w), /* port A out */ + DEVCB_DEVICE_HANDLER("pia4", spiders_audio_command_w), /* port B out */ DEVCB_NULL, /* line CA2 out */ DEVCB_NULL, /* port CB2 out */ DEVCB_LINE(main_cpu_irq), /* IRQA */ @@ -358,8 +358,8 @@ static const pia6821_interface pia_4_intf = DEVCB_NULL, /* line CB1 in */ DEVCB_NULL, /* line CA2 in */ DEVCB_NULL, /* line CB2 in */ - DEVCB_DEVICE_HANDLER(SOUND, "discrete", spiders_audio_a_w), /* port A out */ - DEVCB_DEVICE_HANDLER(SOUND, "discrete", spiders_audio_b_w), /* port B out */ + DEVCB_DEVICE_HANDLER("discrete", spiders_audio_a_w), /* port A out */ + DEVCB_DEVICE_HANDLER("discrete", spiders_audio_b_w), /* port B out */ DEVCB_NULL, /* line CA2 out */ DEVCB_NULL, /* port CB2 out */ DEVCB_LINE(audio_cpu_irq), /* IRQA */ @@ -382,7 +382,7 @@ static const pia6821_interface pia_4_intf = static WRITE8_DEVICE_HANDLER( ic60_74123_output_changed) { - const device_config *pia2 = devtag_get_device(device->machine, PIA6821, "pia2"); + const device_config *pia2 = devtag_get_device(device->machine, "pia2"); pia_ca1_w(pia2, 0, data); } @@ -509,7 +509,7 @@ static MC6845_UPDATE_ROW( update_row ) static MC6845_ON_DE_CHANGED( display_enable_changed ) { - ttl74123_a_w(devtag_get_device(device->machine, TTL74123, "ic60"), 0, display_enabled); + ttl74123_a_w(devtag_get_device(device->machine, "ic60"), 0, display_enabled); } @@ -528,7 +528,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( spiders ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = devtag_get_device(screen->machine, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; @@ -584,12 +584,12 @@ static READ8_DEVICE_HANDLER( gfx_rom_r ) static ADDRESS_MAP_START( spiders_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE(&spiders_ram) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) AM_RANGE(0xc020, 0xc027) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xc044, 0xc047) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) - AM_RANGE(0xc048, 0xc04b) AM_DEVREADWRITE(PIA6821, "pia2", pia_alt_r, pia_alt_w) - AM_RANGE(0xc050, 0xc053) AM_DEVREADWRITE(PIA6821, "pia3", pia_r, pia_w) + AM_RANGE(0xc044, 0xc047) AM_DEVREADWRITE("pia1", pia_r, pia_w) + AM_RANGE(0xc048, 0xc04b) AM_DEVREADWRITE("pia2", pia_alt_r, pia_alt_w) + AM_RANGE(0xc050, 0xc053) AM_DEVREADWRITE("pia3", pia_r, pia_w) AM_RANGE(0xc060, 0xc060) AM_READ_PORT("DSW1") AM_RANGE(0xc080, 0xc080) AM_READ_PORT("DSW2") AM_RANGE(0xc0a0, 0xc0a0) AM_READ_PORT("DSW3") @@ -599,7 +599,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spiders_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM - AM_RANGE(0x0080, 0x0083) AM_DEVREADWRITE(PIA6821, "pia4", pia_r, pia_w) + AM_RANGE(0x0080, 0x0083) AM_DEVREADWRITE("pia4", pia_r, pia_w) AM_RANGE(0xf800, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index a7e62d5b1eb..39e7a6c4c39 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -135,7 +135,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( splash_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xd7ff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) /* Sound latch */ - AM_RANGE(0xf000, 0xf001) AM_DEVREAD(SOUND, "ym", ym3812_r) /* YM3812 */ + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym", ym3812_r) /* YM3812 */ AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END @@ -154,7 +154,7 @@ static ADDRESS_MAP_START( splash_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_NOP) /* ??? */ - AM_RANGE(0xf000, 0xf001) AM_DEVWRITE(SOUND, "ym", ym3812_w) /* YM3812 */ + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym", ym3812_w) /* YM3812 */ AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) /* RAM */ ADDRESS_MAP_END @@ -212,7 +212,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( roldf_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x12, 0x13) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x12, 0x13) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0x40, 0x40) AM_NOP /* NMI ack */ AM_RANGE(0x70, 0x70) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index 9b922fc360b..9a6f542195e 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -208,9 +208,9 @@ static ADDRESS_MAP_START( spoker_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x6492, 0x6492 ) AM_WRITE( spoker_leds_w ) AM_RANGE( 0x64a0, 0x64a0 ) AM_READ_PORT( "BUTTONS2" ) - AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( SOUND, "ym", ym2413_w ) + AM_RANGE( 0x64b0, 0x64b1 ) AM_DEVWRITE( "ym", ym2413_w ) - AM_RANGE( 0x64c0, 0x64c0 ) AM_DEVREADWRITE( SOUND, "oki", okim6295_r, okim6295_w ) + AM_RANGE( 0x64c0, 0x64c0 ) AM_DEVREADWRITE( "oki", okim6295_r, okim6295_w ) AM_RANGE( 0x64d0, 0x64d1 ) AM_READWRITE( spoker_magic_r, spoker_magic_w ) // DSW1-5 diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 31ea97e23ff..0cc7695e2b2 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -156,7 +156,7 @@ static READ8_HANDLER( spool99_io_r ) // case 0xafe5: return 1; // case 0xafe6: return 1; case 0xafe7: return eeprom_read_bit(); - case 0xaff8: return okim6295_r(devtag_get_device(space->machine, SOUND, "oki"),0); + case 0xaff8: return okim6295_r(devtag_get_device(space->machine, "oki"),0); } } // printf("%04x %d\n",offset+0xaf00,io_switch); @@ -188,7 +188,7 @@ static ADDRESS_MAP_START( spool99_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xafed, 0xafed) AM_WRITE(eeprom_resetline_w ) AM_RANGE(0xafee, 0xafee) AM_WRITE(eeprom_clockline_w ) AM_RANGE(0xafef, 0xafef) AM_WRITE(eeprom_dataline_w ) - AM_RANGE(0xaff8, 0xaff8) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xaff8, 0xaff8) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0xb000, 0xb3ff) AM_RAM AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) // palette diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 80b68d19408..70c720b4ad5 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -141,9 +141,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0x02, 0x02) AM_READ_PORT("EXTRA") AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0x02, 0x02) AM_READ_PORT("EXTRA") AM_DEVWRITE("sn3", sn76496_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_RANGE(0x05, 0x05) AM_READ_PORT("DSW2") AM_RANGE(0x07, 0x07) AM_WRITE(sprcros2_m_port7_w) diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index f670a7911d7..7d0d2707e3c 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -71,7 +71,7 @@ static int service_mode(running_machine *machine) static INTERRUPT_GEN( sprint2 ) { - const device_config *discrete = devtag_get_device(device->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(device->machine, "discrete"); static UINT8 dial[2]; /* handle steering wheels */ @@ -267,9 +267,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_WRITE(sprint2_wram_w) AM_RANGE(0x0400, 0x07ff) AM_WRITE(sprint2_video_ram_w) AM_BASE(&sprint2_video_ram) - AM_RANGE(0x0c00, 0x0c0f) AM_DEVWRITE(SOUND, "discrete", sprint2_attract_w) - AM_RANGE(0x0c10, 0x0c1f) AM_DEVWRITE(SOUND, "discrete", sprint2_skid1_w) - AM_RANGE(0x0c20, 0x0c2f) AM_DEVWRITE(SOUND, "discrete", sprint2_skid2_w) + AM_RANGE(0x0c00, 0x0c0f) AM_DEVWRITE("discrete", sprint2_attract_w) + AM_RANGE(0x0c10, 0x0c1f) AM_DEVWRITE("discrete", sprint2_skid1_w) + AM_RANGE(0x0c20, 0x0c2f) AM_DEVWRITE("discrete", 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(SMH_NOP) /* SPARE */ @@ -278,7 +278,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", sprint2_noise_reset_w) + AM_RANGE(0x0f00, 0x0f7f) AM_DEVWRITE("discrete", sprint2_noise_reset_w) 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 e0fbf9a7e42..895b5effcc3 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -252,16 +252,16 @@ static ADDRESS_MAP_START( sprint4_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x17ff) AM_READ_PORT("IN0") AM_RANGE(0x1800, 0x1fff) AM_READ_PORT("IN1") - AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x71f) AM_DEVWRITE(SOUND, "discrete", sprint4_attract_w) + AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x71f) AM_DEVWRITE("discrete", sprint4_attract_w) AM_RANGE(0x0020, 0x0027) AM_MIRROR(0x718) AM_WRITE(sprint4_collision_reset_w) AM_RANGE(0x0040, 0x0041) AM_MIRROR(0x718) AM_WRITE(sprint4_da_latch_w) - AM_RANGE(0x0042, 0x0043) AM_MIRROR(0x718) AM_DEVWRITE(SOUND, "discrete", sprint4_bang_w) + AM_RANGE(0x0042, 0x0043) AM_MIRROR(0x718) AM_DEVWRITE("discrete", sprint4_bang_w) AM_RANGE(0x0044, 0x0045) AM_MIRROR(0x718) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0060, 0x0067) AM_MIRROR(0x710) AM_WRITE(sprint4_lamp_w) - AM_RANGE(0x0068, 0x0069) AM_MIRROR(0x710) AM_DEVWRITE(SOUND, "discrete", sprint4_screech_1_w) - AM_RANGE(0x006a, 0x006b) AM_MIRROR(0x710) AM_DEVWRITE(SOUND, "discrete", sprint4_screech_2_w) - AM_RANGE(0x006c, 0x006d) AM_MIRROR(0x710) AM_DEVWRITE(SOUND, "discrete", sprint4_screech_3_w) - AM_RANGE(0x006e, 0x006f) AM_MIRROR(0x710) AM_DEVWRITE(SOUND, "discrete", sprint4_screech_4_w) + AM_RANGE(0x0068, 0x0069) AM_MIRROR(0x710) AM_DEVWRITE("discrete", sprint4_screech_1_w) + AM_RANGE(0x006a, 0x006b) AM_MIRROR(0x710) AM_DEVWRITE("discrete", sprint4_screech_2_w) + AM_RANGE(0x006c, 0x006d) AM_MIRROR(0x710) AM_DEVWRITE("discrete", sprint4_screech_3_w) + AM_RANGE(0x006e, 0x006f) AM_MIRROR(0x710) AM_DEVWRITE("discrete", sprint4_screech_4_w) AM_RANGE(0x2000, 0x27ff) AM_NOP /* diagnostic ROM */ AM_RANGE(0x2800, 0x3fff) AM_ROM diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 8493a856a2b..f14d2964728 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -343,10 +343,10 @@ static WRITE8_HANDLER( sound_bank_w ) bank_A = (data >> 0) & 0x03; bank_B = (data >> 2) & 0x03; - k007232_set_bank(devtag_get_device(space->machine, SOUND, "konami1"),bank_A,bank_B); + k007232_set_bank(devtag_get_device(space->machine, "konami1"),bank_A,bank_B); bank_A = (data >> 4) & 0x03; bank_B = (data >> 6) & 0x03; - k007232_set_bank(devtag_get_device(space->machine, SOUND, "konami2"),bank_A,bank_B); + k007232_set_bank(devtag_get_device(space->machine, "konami2"),bank_A,bank_B); } @@ -380,9 +380,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spy_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0xa000, 0xa00d) AM_DEVREAD(SOUND, "konami1", k007232_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREAD(SOUND, "konami2", k007232_r) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym3812_r) + AM_RANGE(0xa000, 0xa00d) AM_DEVREAD("konami1", k007232_r) + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami2", k007232_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym3812_r) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -390,9 +390,9 @@ static ADDRESS_MAP_START( spy_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "konami1", k007232_w) - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami2", k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym3812_w) + AM_RANGE(0xa000, 0xa00d) AM_DEVWRITE("konami1", k007232_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami2", k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym3812_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 322bcfef756..a2c4d02b742 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -396,7 +396,7 @@ static ADDRESS_MAP_START( srmp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_input_2_r) /* I/O port 2 */ AM_RANGE(0xb00000, 0xb00001) AM_READ(srmp2_cchip_status_0_r) /* Custom chip status ??? */ AM_RANGE(0xb00002, 0xb00003) AM_READ(srmp2_cchip_status_1_r) /* Custom chip status ??? */ - AM_RANGE(0xf00000, 0xf00001) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) + AM_RANGE(0xf00000, 0xf00001) AM_DEVREAD8("ay", ay8910_r, 0x00ff) ADDRESS_MAP_END static ADDRESS_MAP_START( srmp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -409,11 +409,11 @@ static ADDRESS_MAP_START( srmp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE(SOUND, "msm", srmp2_adpcm_code_w) /* ADPCM number */ + AM_RANGE(0xb00000, 0xb00001) AM_DEVWRITE("msm", srmp2_adpcm_code_w) /* ADPCM number */ 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, 0xf00003) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xf00000, 0xf00003) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) ADDRESS_MAP_END @@ -431,7 +431,7 @@ static ADDRESS_MAP_START( mjyuugi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) + AM_RANGE(0xb00000, 0xb00001) AM_DEVREAD8("ay", ay8910_r, 0x00ff) 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 */ @@ -445,8 +445,8 @@ static ADDRESS_MAP_START( mjyuugi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x7003ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x900000, 0x900001) AM_WRITE(srmp2_input_1_w) /* I/O ??? */ AM_RANGE(0x900002, 0x900003) AM_WRITE(srmp2_input_2_w) /* I/O ??? */ - AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE(SOUND, "msm", srmp2_adpcm_code_w) /* ADPCM number */ - AM_RANGE(0xb00000, 0xb00003) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE("msm", srmp2_adpcm_code_w) /* ADPCM number */ + AM_RANGE(0xb00000, 0xb00003) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) 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 */ @@ -587,12 +587,12 @@ static ADDRESS_MAP_START( srmp3_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_WRITE(SMH_NOP) /* elapsed interrupt signal */ AM_RANGE(0x40, 0x40) AM_READ_PORT("SYSTEM") AM_WRITE(srmp3_flags_w) /* coin, service | GFX bank, counter, lockout */ AM_RANGE(0x60, 0x60) AM_WRITE(srmp3_rombank_w) /* ROM bank select */ - AM_RANGE(0xa0, 0xa0) AM_DEVWRITE(SOUND, "msm", srmp3_adpcm_code_w) /* ADPCM number */ + AM_RANGE(0xa0, 0xa0) AM_DEVWRITE("msm", srmp3_adpcm_code_w) /* ADPCM number */ AM_RANGE(0xa1, 0xa1) AM_READ(srmp3_cchip_status_0_r) /* custom chip status ??? */ AM_RANGE(0xc0, 0xc0) AM_READWRITE(srmp3_input_r, srmp3_input_1_w) /* key matrix | I/O ??? */ AM_RANGE(0xc1, 0xc1) AM_READWRITE(srmp3_cchip_status_1_r, srmp3_input_2_w) /* custom chip status ??? | I/O ??? */ - AM_RANGE(0xe0, 0xe1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xe2, 0xe2) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xe0, 0xe1) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xe2, 0xe2) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 37504653476..e5698189431 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -331,7 +331,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE(SOUND, "st", st0016_snd_r, st0016_snd_w) + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index b7c147f1353..b4eae3324ee 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -528,8 +528,8 @@ static ADDRESS_MAP_START( srmp6, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x5fff00, 0x5fffff) AM_WRITE(dma_w) AM_BASE(&dmaram) AM_RANGE(0x4c0000, 0x4c006f) AM_READWRITE(video_regs_r, video_regs_w) AM_BASE(&video_regs) // ? gfx regs ST-0026 NiLe - AM_RANGE(0x4e0000, 0x4e00ff) AM_DEVREADWRITE(SOUND, "nile", nile_snd_r, nile_snd_w) AM_BASE(&nile_sound_regs) - AM_RANGE(0x4e0100, 0x4e0101) AM_DEVREADWRITE(SOUND, "nile", nile_sndctrl_r, nile_sndctrl_w) + AM_RANGE(0x4e0000, 0x4e00ff) AM_DEVREADWRITE("nile", nile_snd_r, nile_snd_w) AM_BASE(&nile_sound_regs) + AM_RANGE(0x4e0100, 0x4e0101) AM_DEVREADWRITE("nile", nile_sndctrl_r, nile_sndctrl_w) // AM_RANGE(0x4e0110, 0x4e0111) AM_NOP // ? accessed once ($268dc, written $b.w) // AM_RANGE(0x5fff00, 0x5fff1f) AM_RAM // ? see routine $5ca8, video_regs related ??? diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index d627656bfd6..3db77096c1a 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -120,8 +120,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym2", ym2203_w) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 99a872b7240..2ae98c3ee1d 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -190,14 +190,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2203_r) 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(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2203_w) 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 26d33143f9f..3c311ea5dca 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -121,7 +121,7 @@ static VIDEO_START(ssingles) static VIDEO_UPDATE( ssingles ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, "crtc"); + const device_config *mc6845 = devtag_get_device(screen->machine, "crtc"); mc6845_update(mc6845, bitmap, cliprect); return 0; @@ -173,17 +173,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ssingles_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE(SOUND, "ay1", ay8910_address_w) - AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE(SOUND, "ay2", ay8910_address_w) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay1", ay8910_address_w) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("ay2", ay8910_address_w) AM_RANGE(0x08, 0x08) AM_READNOP - AM_RANGE(0x0a, 0x0a) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) + AM_RANGE(0x0a, 0x0a) AM_DEVWRITE("ay2", ay8910_data_w) AM_RANGE(0x16, 0x16) AM_READ_PORT("DSW0") AM_RANGE(0x18, 0x18) AM_READ_PORT("DSW1") AM_RANGE(0x1c, 0x1c) AM_READ_PORT("INPUTS") AM_RANGE(0x1a, 0x1a) AM_WRITENOP //video/crt related - AM_RANGE(0xfe, 0xfe) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) - AM_RANGE(0xff, 0xff) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0xfe, 0xfe) AM_DEVWRITE("crtc", mc6845_address_w) + AM_RANGE(0xff, 0xff) AM_DEVWRITE("crtc", mc6845_register_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index de3be869178..ae331e43b06 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -242,7 +242,7 @@ VIDEO_UPDATE(powerbls); static TIMER_CALLBACK( music_playback ) { int pattern = 0; - const device_config *device = devtag_get_device(machine, SOUND, "oki"); + const device_config *device = devtag_get_device(machine, "oki"); if ((okim6295_r(device,0) & 0x08) == 0) { @@ -421,7 +421,7 @@ static ADDRESS_MAP_START( sslam_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300018, 0x300019) AM_READ_PORT("IN4") AM_RANGE(0x30001a, 0x30001b) AM_READ_PORT("DSW1") AM_RANGE(0x30001c, 0x30001d) AM_READ_PORT("DSW2") - AM_RANGE(0x30001e, 0x30001f) AM_DEVWRITE(SOUND, "oki", sslam_snd_w) + AM_RANGE(0x30001e, 0x30001f) AM_DEVWRITE("oki", sslam_snd_w) AM_RANGE(0xf00000, 0xffffff) AM_RAM /* Main RAM */ AM_RANGE(0x000000, 0xffffff) AM_ROM /* I don't honestly know where the rom is mirrored .. so all unmapped reads / writes go to rom */ @@ -458,7 +458,7 @@ static READ8_HANDLER( playmark_snd_command_r ) data = soundlatch_r(space,0); } else if ((playmark_oki_control & 0x38) == 0x28) { - data = (okim6295_r(devtag_get_device(space->machine, SOUND, "oki"),0) & 0x0f); + data = (okim6295_r(devtag_get_device(space->machine, "oki"),0) & 0x0f); } return data; @@ -478,13 +478,13 @@ static WRITE8_HANDLER( playmark_snd_control_w ) if(playmark_oki_bank != ((data & 3) - 1)) { playmark_oki_bank = (data & 3) - 1; - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), 0x40000 * playmark_oki_bank); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), 0x40000 * playmark_oki_bank); } } if ((data & 0x38) == 0x18) { - okim6295_w(devtag_get_device(space->machine, SOUND, "oki"), 0, playmark_oki_command); + okim6295_w(devtag_get_device(space->machine, "oki"), 0, playmark_oki_command); } // !(data & 0x80) -> sound enable diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index 194fd863893..01e2e729d62 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -101,9 +101,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x2002, 0x2003) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x2004, 0x2004) AM_DEVWRITE(SOUND, "dac", dac_signed_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x2004, 0x2004) AM_DEVWRITE("dac", dac_signed_w) AM_RANGE(0x2005, 0x2005) AM_WRITE(interrupt_enable_w) AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index 1d051fc47a9..531abdc85e0 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf000) AM_READ_PORT("IN0") AM_RANGE(0xf001, 0xf001) AM_READ(ssrj_wheel_r) AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN2") - AM_RANGE(0xf401, 0xf401) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0xf401, 0xf401) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0xf400, 0xf401) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xf400, 0xf401) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xf800, 0xf800) AM_WRITE(SMH_NOP) /* wheel ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index e62c585e84f..21047793692 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -435,7 +435,7 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; } AM_RANGE(0x21000a, 0x21000b) AM_READ_PORT("P2") \ AM_RANGE(0x21000c, 0x21000d) AM_READ_PORT("SYSTEM") \ AM_RANGE(0x21000e, 0x21000f) AM_READ(SMH_NOP ) /* */ \ - AM_RANGE(0x300000, 0x30007f) AM_DEVREAD8(SOUND, "ensoniq", es5506_r, 0x00ff ) /* Sound */ \ + AM_RANGE(0x300000, 0x30007f) AM_DEVREAD8("ensoniq", es5506_r, 0x00ff ) /* Sound */ \ AM_RANGE(0x482000, 0x482fff) AM_RAM_WRITE(dsp_w) AM_BASE(&dsp_ram) \ AM_RANGE(_ROM, 0xffffff) AM_READ(SMH_BANK1 ) /* ROM */ \ //AM_RANGE(0x990000, 0x99007f) AM_READ(fake_r) @@ -451,7 +451,7 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; } 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_DEVWRITE8(SOUND, "ensoniq", es5506_w, 0x00ff) /* Sound */ \ + AM_RANGE(0x300000, 0x30007f) AM_DEVWRITE8("ensoniq", es5506_w, 0x00ff) /* Sound */ \ //AM_RANGE(0x990000, 0x99007f) AM_WRITE(ssv_scroll_w) @@ -835,7 +835,7 @@ static WRITE16_HANDLER( srmp7_sound_bank_w ) { if (ACCESSING_BITS_0_7) { - const device_config *device = devtag_get_device(space->machine, SOUND, "ensoniq"); + const device_config *device = devtag_get_device(space->machine, "ensoniq"); int bank = 0x400000/2 * (data & 1); // UINT16 address int voice; for (voice = 0; voice < 32; voice++) diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index c0878658236..7736b54fcf3 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -34,7 +34,7 @@ static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xe87f) AM_RAM /* common ram */ - AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE(SOUND, "st", st0016_snd_r, st0016_snd_w) /* sound regs 8 x $20 bytes, see notes */ + AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("st", st0016_snd_r, st0016_snd_w) /* sound regs 8 x $20 bytes, see notes */ AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM /* work ram */ diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 853b92631ad..951c44799db 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -80,10 +80,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x05ff) AM_RAM - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x1000, 0x1001) AM_DEVWRITE(SOUND, "ym2", ym3812_w) + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x3800, 0x3800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x3800, 0x3800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 133e9511598..0ed1c6284b9 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -186,8 +186,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "discrete", starshp1_audio_w) - AM_RANGE(0xdf00, 0xdf0f) AM_DEVWRITE(SOUND, "discrete", starshp1_analog_out_w) + AM_RANGE(0xde00, 0xde0f) AM_DEVWRITE("discrete", starshp1_audio_w) + AM_RANGE(0xdf00, 0xdf0f) AM_DEVWRITE("discrete", starshp1_analog_out_w) 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 198aa30e38c..29c3d886ce7 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -198,7 +198,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(starwars_sout_w) AM_RANGE(0x0800, 0x0fff) AM_READ(starwars_sin_r) /* SIN Read */ AM_RANGE(0x1000, 0x107f) AM_RAM /* 6532 ram */ - AM_RANGE(0x1080, 0x109f) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) + AM_RANGE(0x1080, 0x109f) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) AM_RANGE(0x1800, 0x183f) AM_WRITE(quad_pokey_w) AM_RANGE(0x2000, 0x27ff) AM_RAM /* program RAM */ AM_RANGE(0x4000, 0x7fff) AM_ROM /* sound roms */ diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 0189d090312..42659d9c3a3 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -338,7 +338,7 @@ static ADDRESS_MAP_START( statriv2_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN0") AM_RANGE(0x21, 0x21) AM_READ_PORT("IN1") AM_RANGE(0x2b, 0x2b) AM_READ(statriv2_questions_read) // question data - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) // ??? + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) // ??? AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END @@ -347,7 +347,7 @@ static ADDRESS_MAP_START( statriv2_writeport, ADDRESS_SPACE_IO, 8 ) 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, 0xb1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END @@ -355,7 +355,7 @@ static ADDRESS_MAP_START( statriv4_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN0") AM_RANGE(0x21, 0x21) AM_READ_PORT("IN1") AM_RANGE(0x28, 0x28) AM_READ(statriv2_questions_read) // question data - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) // ??? + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) // ??? AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END @@ -364,7 +364,7 @@ static ADDRESS_MAP_START( statriv4_writeport, ADDRESS_SPACE_IO, 8 ) 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, 0xb1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END @@ -372,7 +372,7 @@ static ADDRESS_MAP_START( supertr2_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN0") AM_RANGE(0x21, 0x21) AM_READ_PORT("IN1") AM_RANGE(0x28, 0x28) AM_READ(supertr2_questions_read) // question data - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) // ??? + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) // ??? AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END @@ -382,7 +382,7 @@ static ADDRESS_MAP_START( supertr2_writeport, ADDRESS_SPACE_IO, 8 ) 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, 0xb1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END @@ -391,7 +391,7 @@ static ADDRESS_MAP_START( trivquiz_writeport, ADDRESS_SPACE_IO, 8 ) 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, 0xb1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END @@ -399,7 +399,7 @@ static ADDRESS_MAP_START( trivquiz_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN0") AM_RANGE(0x21, 0x21) AM_READ_PORT("IN1") AM_RANGE(0x2a, 0x2a) AM_READ(statriv2_questions_read) // question data - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) // ??? + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) // ??? AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END @@ -407,7 +407,7 @@ static ADDRESS_MAP_START( supertr3_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN0") AM_RANGE(0x21, 0x21) AM_READ_PORT("IN1") AM_RANGE(0x28, 0x28) AM_READ(supertr3_questions_read) // question data - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) // ??? + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) // ??? AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END @@ -415,15 +415,15 @@ static ADDRESS_MAP_START( hangman_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN0") AM_RANGE(0x21, 0x21) AM_READ_PORT("IN1") AM_RANGE(0x28, 0x28) AM_READ(hangman_questions_read) // question data - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) // ??? + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) // ??? AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( statusbj_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x20, 0x23) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xb0, 0xb1) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0xb1, 0xb1) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0xb1, 0xb1) AM_DEVREAD("ay", ay8910_r) AM_RANGE(0xc0, 0xcf) AM_READWRITE(SMH_NOP, SMH_NOP) /* 9927 CRT controller? */ // AM_RANGE(0xce,0xce) AM_READ(test_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index 7bc22dfe24e..4505c5902b8 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -254,7 +254,7 @@ static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "msm", stfight_adpcm_control_w) /* voice control */ + AM_RANGE(0xc600, 0xc600) AM_DEVWRITE("msm", stfight_adpcm_control_w) /* voice control */ AM_RANGE(0xc700, 0xc700) AM_WRITE(stfight_coin_w) /* coin mech */ AM_RANGE(0xc804, 0xc806) AM_WRITE(SMH_NOP) /* TBD */ AM_RANGE(0xc807, 0xc807) AM_WRITE(stfight_sprite_bank_w) @@ -268,8 +268,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym1", ym2203_r) - AM_RANGE(0xc800, 0xc801) AM_DEVREAD(SOUND, "ym2", ym2203_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym1", ym2203_r) + AM_RANGE(0xc800, 0xc801) AM_DEVREAD("ym2", ym2203_r) AM_RANGE(0xf000, 0xf000) AM_READ(stfight_fm_r) AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) @@ -277,8 +277,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0xc800, 0xc801) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ym2", ym2203_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(stfight_e800_w) AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index cdc828aaf23..8a6923e60bb 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -118,9 +118,9 @@ static ADDRESS_MAP_START( stlforce_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_READ_PORT("INPUT") AM_RANGE(0x400002, 0x400003) AM_READ_PORT("SYSTEM") AM_RANGE(0x400010, 0x400011) AM_WRITE(eeprom_w) - AM_RANGE(0x400012, 0x400013) AM_DEVWRITE(SOUND, "oki", oki_bank_w) + AM_RANGE(0x400012, 0x400013) AM_DEVWRITE("oki", oki_bank_w) AM_RANGE(0x40001e, 0x40001f) AM_WRITENOP // sprites buffer commands - AM_RANGE(0x410000, 0x410001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x410000, 0x410001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) ADDRESS_MAP_END static INPUT_PORTS_START( stlforce ) diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index 70d9f309a57..c579050f476 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -126,8 +126,8 @@ static ADDRESS_MAP_START( strnskil_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xd802, 0xd802) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 524c4a6348a..e8e981efaad 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -1992,7 +1992,7 @@ static ADDRESS_MAP_START( stv_mem, ADDRESS_SPACE_PROGRAM, 32 ) /* Sound */ AM_RANGE(0x05a00000, 0x05a7ffff) AM_READWRITE(stv_sh2_soundram_r, stv_sh2_soundram_w) //AM_RANGE(0x05a80000, 0x05afffff) AM_READ(stv_sh2_random_r) - AM_RANGE(0x05b00000, 0x05b00fff) AM_DEVREADWRITE16(SOUND, "scsp", scsp_r, scsp_w, 0xffffffff) + AM_RANGE(0x05b00000, 0x05b00fff) AM_DEVREADWRITE16("scsp", scsp_r, scsp_w, 0xffffffff) /* VDP1 */ AM_RANGE(0x05c00000, 0x05c7ffff) AM_READWRITE(stv_vdp1_vram_r, stv_vdp1_vram_w) AM_RANGE(0x05c80000, 0x05cbffff) AM_READWRITE(stv_vdp1_framebuffer0_r, stv_vdp1_framebuffer0_w) @@ -2008,7 +2008,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_BASE(&sound_ram) - AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE(SOUND, "scsp", scsp_r, scsp_w) + AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp", scsp_r, scsp_w) ADDRESS_MAP_END #define STV_PLAYER_INPUTS(_n_, _b1_, _b2_, _b3_) \ @@ -2490,7 +2490,7 @@ static const scsp_interface scsp_config = static MACHINE_START( stv ) { - scsp_set_ram_base(devtag_get_device(machine, SOUND, "scsp"), sound_ram); + scsp_set_ram_base(devtag_get_device(machine, "scsp"), sound_ram); // save states state_save_register_global_pointer(machine, smpc_ram, 0x80); diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index 6e96c26dd16..1e3141c2947 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -58,16 +58,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0000) AM_DEVWRITE(SOUND, "discrete", subs_noise_reset_w) + AM_RANGE(0x0000, 0x0000) AM_DEVWRITE("discrete", subs_noise_reset_w) AM_RANGE(0x0020, 0x0020) AM_WRITE(subs_steer_reset_w) // AM_RANGE(0x0040, 0x0040) AM_WRITE(subs_timer_reset_w) AM_RANGE(0x0060, 0x0061) AM_WRITE(subs_lamp1_w) AM_RANGE(0x0062, 0x0063) AM_WRITE(subs_lamp2_w) - AM_RANGE(0x0064, 0x0065) AM_DEVWRITE(SOUND, "discrete", subs_sonar2_w) - AM_RANGE(0x0066, 0x0067) AM_DEVWRITE(SOUND, "discrete", subs_sonar1_w) + AM_RANGE(0x0064, 0x0065) AM_DEVWRITE("discrete", subs_sonar2_w) + AM_RANGE(0x0066, 0x0067) AM_DEVWRITE("discrete", subs_sonar1_w) // Schematics show crash and explode reversed. But this is proper. - AM_RANGE(0x0068, 0x0069) AM_DEVWRITE(SOUND, "discrete", subs_explode_w) - AM_RANGE(0x006a, 0x006b) AM_DEVWRITE(SOUND, "discrete", subs_crash_w) + AM_RANGE(0x0068, 0x0069) AM_DEVWRITE("discrete", subs_explode_w) + AM_RANGE(0x006a, 0x006b) AM_DEVWRITE("discrete", 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(SMH_RAM) AM_BASE(&spriteram) diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index d2d1e62c035..652a5768670 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -120,9 +120,9 @@ static ADDRESS_MAP_START( srider_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0d00c, 0x0d00c ) AM_READ_PORT( "INC" ) - AM_RANGE( 0x0d016, 0x0d017 ) AM_DEVWRITE( SOUND, "ym", ym3812_w ) + AM_RANGE( 0x0d016, 0x0d017 ) AM_DEVWRITE( "ym", ym3812_w ) - AM_RANGE( 0x0d018, 0x0d018 ) AM_DEVWRITE( SOUND, "oki", okim6295_w ) + AM_RANGE( 0x0d018, 0x0d018 ) AM_DEVWRITE( "oki", okim6295_w ) AM_RANGE( 0x0d01b, 0x0d01b ) AM_WRITE( subsino_tiles_offset_w ) diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 5ee05c42e4d..b0ce1c099cb 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -254,14 +254,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREAD(SOUND, "ym", ym2151_r ) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVREAD("ym", ym2151_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(SMH_ROM ) // ROM AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ym", ym2151_w ) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ym", ym2151_w ) // YM2151 AM_RANGE(0xfd00, 0xfd00) AM_WRITE(soundlatch2_w ) // To PCM Z80 #1 AM_RANGE(0xfe00, 0xfe00) AM_WRITE(soundlatch3_w ) // To PCM Z80 #2 ADDRESS_MAP_END @@ -273,14 +273,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( uballoon_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREAD(SOUND, "ym", ym2151_r ) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVREAD("ym", ym2151_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(SMH_ROM ) // ROM AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM ) // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ym", ym2151_w ) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ym", ym2151_w ) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w ) // To PCM Z80 ADDRESS_MAP_END @@ -291,14 +291,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sunaq_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xe82f) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xe830, 0xf7ff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREAD(SOUND, "ym", ym2151_r ) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVREAD("ym", ym2151_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(SMH_ROM ) // ROM AM_RANGE(0xe830, 0xf7ff) AM_WRITE(SMH_RAM ) // RAM (writes to efxx, could be a program bug tho) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ym", ym2151_w ) // YM2151 + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ym", ym2151_w ) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w ) // To PCM Z80 ADDRESS_MAP_END @@ -308,8 +308,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bestbest_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0xbfff ) AM_ROM // ROM - AM_RANGE( 0xc000, 0xc001 ) AM_DEVWRITE( SOUND, "ym", ym3526_w ) // - AM_RANGE( 0xc002, 0xc003 ) AM_DEVWRITE( SOUND, "ay", ay8910_address_data_w ) // AY8910 + AM_RANGE( 0xc000, 0xc001 ) AM_DEVWRITE( "ym", ym3526_w ) // + AM_RANGE( 0xc002, 0xc003 ) AM_DEVWRITE( "ay", ay8910_address_data_w ) // AY8910 AM_RANGE( 0xe000, 0xe7ff ) AM_RAM // RAM AM_RANGE( 0xf000, 0xf000 ) AM_WRITE( soundlatch2_w ) // To PCM Z80 AM_RANGE( 0xf800, 0xf800 ) AM_READ ( soundlatch_r ) // From Main CPU @@ -374,12 +374,12 @@ ADDRESS_MAP_END static WRITE8_HANDLER( bssoccer_DAC_1_w ) { - dac_data_w( devtag_get_device(space->machine, SOUND, (offset & 1) ? "dac2" : "dac1"), (data & 0xf) * 0x11 ); + dac_data_w( devtag_get_device(space->machine, (offset & 1) ? "dac2" : "dac1"), (data & 0xf) * 0x11 ); } static WRITE8_HANDLER( bssoccer_DAC_2_w ) { - dac_data_w( devtag_get_device(space->machine, SOUND, (offset & 1) ? "dac4" : "dac3"), (data & 0xf) * 0x11 ); + dac_data_w( devtag_get_device(space->machine, (offset & 1) ? "dac4" : "dac3"), (data & 0xf) * 0x11 ); } static ADDRESS_MAP_START( bssoccer_pcm_1_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 556ac5c353e..5ff6444652c 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -964,7 +964,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0xc800, 0xc800) AM_DEVREAD(SOUND, "ym", ym3812_status_port_r) // ? unsure + AM_RANGE(0xc800, 0xc800) AM_DEVREAD("ym", ym3812_status_port_r) // ? unsure AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END @@ -972,8 +972,8 @@ static ADDRESS_MAP_START( hardhead_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) - AM_RANGE(0xa002, 0xa003) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w ) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) + AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("ay", ay8910_address_data_w ) ADDRESS_MAP_END @@ -997,8 +997,8 @@ static ADDRESS_MAP_START( rranger_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xa001) AM_DEVWRITE(SOUND, "ym1", ym2203_w ) - AM_RANGE(0xa002, 0xa003) AM_DEVWRITE(SOUND, "ym2", ym2203_w ) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym1", ym2203_w ) + AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("ym2", ym2203_w ) ADDRESS_MAP_END @@ -1014,8 +1014,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( brickzn_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym3812_w ) - AM_RANGE(0xc002, 0xc003) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w ) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym3812_w ) + AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("ay", ay8910_address_data_w ) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w ) // To PCM CPU ADDRESS_MAP_END @@ -1034,7 +1034,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( brickzn_pcm_w ) { static const char *dacs[] = { "dac1", "dac2", "dac3", "dac4" }; - dac_signed_data_w( devtag_get_device(space->machine, SOUND, dacs[offset & 3]), (data & 0xf) * 0x11 ); + dac_signed_data_w( devtag_get_device(space->machine, dacs[offset & 3]), (data & 0xf) * 0x11 ); } @@ -1466,8 +1466,8 @@ static const ay8910_interface hardhead_ay8910_interface = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "samples", suna8_play_samples_w), - DEVCB_DEVICE_HANDLER(SOUND, "samples", suna8_samples_number_w) + DEVCB_DEVICE_HANDLER("samples", suna8_play_samples_w), + DEVCB_DEVICE_HANDLER("samples", suna8_samples_number_w) }; static const samples_interface suna8_samples_interface = @@ -1685,8 +1685,8 @@ static const ay8910_interface starfigh_ay8910_interface = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "samples", suna8_play_samples_w), - DEVCB_DEVICE_HANDLER(SOUND, "samples", suna8_samples_number_w) + DEVCB_DEVICE_HANDLER("samples", suna8_play_samples_w), + DEVCB_DEVICE_HANDLER("samples", suna8_samples_number_w) }; static MACHINE_DRIVER_START( starfigh ) diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index d26847ad8a3..4f0246680ff 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -121,8 +121,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) - AM_RANGE(0x110000, 0x110001) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x120000, 0x120001) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x110000, 0x110001) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x120000, 0x120001) AM_DEVREAD("oki", okim6295_r) 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(SMH_BANK8) @@ -131,8 +131,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVWRITE("oki", okim6295_w) 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) diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 41232d3a382..9cb55b5c74c 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -58,7 +58,7 @@ static ADDRESS_MAP_START( sdpoker_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8006, 0x8006) AM_READ_PORT("IN5") //dips? AM_RANGE(0x9000, 0x90ff) AM_RAM AM_RANGE(0x9400, 0x9400) AM_READ(sdpoker_rng_r) - AM_RANGE(0x9800, 0x9801) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x9800, 0x9801) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( supdrapo ) diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 71f79b55dfb..2511b82825d 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -186,7 +186,7 @@ static ADDRESS_MAP_START( superdq_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW1") AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW2") - AM_RANGE(0x04, 0x04) AM_READ(superdq_ld_r) AM_DEVWRITE(SOUND, "sn", sn76496_w) + AM_RANGE(0x04, 0x04) AM_READ(superdq_ld_r) AM_DEVWRITE("sn", sn76496_w) AM_RANGE(0x08, 0x08) AM_WRITE(superdq_io_w) AM_RANGE(0x0c, 0x0d) AM_NOP /* HD46505S */ ADDRESS_MAP_END @@ -292,7 +292,7 @@ GFXDECODE_END static MACHINE_START( superdq ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); } diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index 32b98352268..8cc8ac01184 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -149,7 +149,7 @@ static SAMPLES_START( pbillian_sh_start ) static WRITE8_HANDLER( pbillian_sample_trigger_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); int start,end; start = data << 7; @@ -539,8 +539,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram) - AM_RANGE(0x0401, 0x0401) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x0402, 0x0403) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay", ay8910_data_address_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) @@ -552,8 +552,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram) - AM_RANGE(0x0401, 0x0401) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x0402, 0x0403) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay", ay8910_data_address_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) @@ -565,10 +565,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram) - AM_RANGE(0x0401, 0x0401) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x0402, 0x0403) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x0405, 0x0405) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x0406, 0x0407) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x0405, 0x0405) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x0406, 0x0407) AM_DEVWRITE("ay2", ay8910_data_address_w) 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) @@ -578,10 +578,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram) - AM_RANGE(0x0401, 0x0401) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x0402, 0x0403) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x0405, 0x0405) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x0406, 0x0407) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x0405, 0x0405) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x0406, 0x0407) AM_DEVWRITE("ay2", ay8910_data_address_w) 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_PORT("SYSTEM") diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index 42db09e00c4..ccf51d338bd 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( supertnk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1bff) AM_RAM AM_RANGE(0x1efc, 0x1efc) AM_READ_PORT("JOYS") AM_RANGE(0x1efd, 0x1efd) AM_READ_PORT("INPUTS") - AM_RANGE(0x1efe, 0x1eff) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x1efe, 0x1eff) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x1efe, 0x1efe) AM_READ_PORT("DSW") AM_RANGE(0x1eff, 0x1eff) AM_READ_PORT("UNK") AM_RANGE(0x2000, 0x3fff) AM_READWRITE(supertnk_videoram_r, supertnk_videoram_w) AM_SIZE(&supertnk_videoram_size) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 880529907a9..4712aa7ac7f 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -105,7 +105,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x05, 0x05) AM_READ_PORT("IN4") AM_WRITE(rom_bank_select_w) AM_RANGE(0x06, 0x06) AM_READ(suprgolf_random) // game locks up or crashes? if this doesn't return right values? - AM_RANGE(0x08, 0x09) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x08, 0x09) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) ADDRESS_MAP_END static INPUT_PORTS_START( suprgolf ) diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index 93017641e4e..3ccc5415141 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -58,8 +58,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xc000, 0xc003) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0xa000, 0xa003) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xc000, 0xc003) AM_DEVWRITE("sn2", sn76496_w) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index e1c02b501b5..5877aaca206 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -790,7 +790,7 @@ static ADDRESS_MAP_START( skns_writemem, ADDRESS_SPACE_PROGRAM, 32 ) 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(SMH_RAM) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) /* 'backup' RAM */ - AM_RANGE(0x00c00000, 0x00c00003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0xffff0000) /* ymz280_w (sound) */ + AM_RANGE(0x00c00000, 0x00c00003) AM_DEVWRITE8("ymz", ymz280b_w, 0xffff0000) /* 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(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) /* sprite ram */ diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c index 87fceed11b4..157a135249e 100644 --- a/src/mame/drivers/suprridr.c +++ b/src/mame/drivers/suprridr.c @@ -205,10 +205,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sound_irq_ack_w) - AM_RANGE(0x8c, 0x8d) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8d, 0x8d) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x8e, 0x8f) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8f, 0x8f) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x8c, 0x8d) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8d, 0x8d) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x8e, 0x8f) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8f, 0x8f) AM_DEVREAD("ay2", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index e6522977ea4..5330fc15a07 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -182,7 +182,7 @@ static ADDRESS_MAP_START( suprslam_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(suprslam_sh_bankswitch_w) AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) ADDRESS_MAP_END /*** INPUT PORTS *************************************************************/ diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index a21afe85b8d..6668af2fe84 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -93,7 +93,7 @@ static ADDRESS_MAP_START( surpratk_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5f8e, 0x5f8e) AM_READ_PORT("DSW3") AM_RANGE(0x5f8f, 0x5f8f) AM_READ_PORT("DSW1") AM_RANGE(0x5f90, 0x5f90) AM_READ_PORT("DSW2") -// AM_RANGE(0x5f91, 0x5f91) AM_DEVREAD(SOUND, "ym", ym2151_status_port_r) /* ? */ +// AM_RANGE(0x5f91, 0x5f91) AM_DEVREAD("ym", ym2151_status_port_r) /* ? */ 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) @@ -107,7 +107,7 @@ static ADDRESS_MAP_START( surpratk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0x5fd0, 0x5fd1) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x5fd0, 0x5fd1) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0x5fc4, 0x5fc4) AM_WRITE(surpratk_videobank_w) AM_RANGE(0x4000, 0x7fff) AM_WRITE(K052109_w) AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index c82ee9206e2..68417aa4280 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -447,8 +447,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "sn1", sn76496_w) /* Choplifter writes to the four addresses */ - AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1ffc) AM_DEVWRITE(SOUND, "sn2", sn76496_w) /* in sequence */ + AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1ffc) AM_DEVWRITE("sn1", sn76496_w) /* Choplifter writes to the four addresses */ + AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1ffc) AM_DEVWRITE("sn2", sn76496_w) /* in sequence */ AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 862278053ab..9c255a26684 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -321,13 +321,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tturfbl_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x00, 0x01) AM_DEVREAD("ym", ym2151_r) 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, 0x01) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) AM_RANGE(0x80, 0x80) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -347,13 +347,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x00, 0x01) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym2151_w) ADDRESS_MAP_END @@ -378,9 +378,9 @@ static WRITE8_DEVICE_HANDLER( upd7759_bank_w ) //* static ADDRESS_MAP_START( sound_writeport_7759, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "7759", upd7759_bank_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "7759", upd7759_port_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("7759", upd7759_bank_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("7759", upd7759_port_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index 55847b01312..cb2ee03365d 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -227,8 +227,8 @@ static ADDRESS_MAP_START( shdancbl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xcc03) AM_DEVREAD(SOUND, "3438.0", ym3438_r) - AM_RANGE(0xd000, 0xd003) AM_DEVREAD(SOUND, "3438.1", ym3438_r) + AM_RANGE(0xcc00, 0xcc03) AM_DEVREAD("3438.0", ym3438_r) + AM_RANGE(0xd000, 0xd003) AM_DEVREAD("3438.1", ym3438_r) AM_RANGE(0xdf00, 0xdfff) AM_READ(SMH_NOP) AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -238,8 +238,8 @@ static ADDRESS_MAP_START(shdancbl_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xcc03) AM_DEVWRITE(SOUND, "3438.0", ym3438_w) - AM_RANGE(0xd000, 0xd003) AM_DEVWRITE(SOUND, "3438.1", ym3438_w) + AM_RANGE(0xcc00, 0xcc03) AM_DEVWRITE("3438.0", ym3438_w) + AM_RANGE(0xd000, 0xd003) AM_DEVWRITE("3438.1", ym3438_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(shdancbl_bankctrl_w) AM_RANGE(0xdf00, 0xdfff) AM_WRITE(SMH_NOP) AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) @@ -266,15 +266,15 @@ static ADDRESS_MAP_START( sound_readmem_18, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "5c68", rf5c68_mem_r) + AM_RANGE(0xd000, 0xdfff) AM_DEVREAD("5c68", rf5c68_mem_r) 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(SMH_ROM) /**** D/A register ****/ - AM_RANGE(0xc000, 0xc008) AM_DEVWRITE(SOUND, "5c68", rf5c68_w) - AM_RANGE(0xd000, 0xdfff) AM_DEVWRITE(SOUND, "5c68", rf5c68_mem_w) + AM_RANGE(0xc000, 0xc008) AM_DEVWRITE("5c68", rf5c68_w) + AM_RANGE(0xd000, 0xdfff) AM_DEVWRITE("5c68", rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) //?? ADDRESS_MAP_END @@ -292,8 +292,8 @@ static WRITE8_HANDLER( sys18_soundbank_w ) static ADDRESS_MAP_START( sound_18_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x80, 0x83) AM_DEVREADWRITE(SOUND, "3438.0", ym3438_r, ym3438_w) - AM_RANGE(0x90, 0x93) AM_DEVREADWRITE(SOUND, "3438.1", ym3438_r, ym3438_w) + AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("3438.0", ym3438_r, ym3438_w) + AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("3438.1", ym3438_r, ym3438_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(sys18_soundbank_w) AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index b244a4777b0..5f589cfcae5 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -68,9 +68,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x2002, 0x2003) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) - AM_RANGE(0x2004, 0x2004) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_data_address_w) + AM_RANGE(0x2004, 0x2004) AM_DEVWRITE("dac", dac_w) AM_RANGE(0x2005, 0x2005) AM_WRITE(interrupt_enable_w) AM_RANGE(0x2007, 0x2007) AM_READ(soundlatch_r) AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index fb5e8567d7a..ecb78537c08 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -94,9 +94,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x07, 0x07) AM_READWRITE(soundlatch_r, SMH_NOP) /* the write is a clear pending command */ - AM_RANGE(0x08, 0x0b) AM_DEVWRITE(SOUND, "ym", ym2608_w) + AM_RANGE(0x08, 0x0b) AM_DEVWRITE("ym", ym2608_w) #if 0 - AM_RANGE(0x18, 0x1b) AM_DEVREAD(SOUND, "ym", ym2608_r) + AM_RANGE(0x18, 0x1b) AM_DEVREAD("ym", ym2608_r) #endif ADDRESS_MAP_END diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 6a461d390bd..40f16a7b5c5 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -968,14 +968,14 @@ static ADDRESS_MAP_START( masterw_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x9001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2203_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(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) ADDRESS_MAP_END @@ -984,7 +984,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -993,7 +993,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan */ @@ -1007,16 +1007,16 @@ static ADDRESS_MAP_START( viofight_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x9001) AM_DEVREAD(SOUND, "ym", ym2203_r) - AM_RANGE(0xb000, 0xb000) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2203_r) + AM_RANGE(0xb000, 0xb000) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2203_w) - AM_RANGE(0xb000, 0xb001) AM_DEVWRITE(SOUND, "oki", okim6295_w) /* yes, both addresses for the same chip */ + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVWRITE("oki", okim6295_w) /* yes, both addresses for the same chip */ AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) ADDRESS_MAP_END @@ -2384,7 +2384,7 @@ static void mb87078_gain_changed(running_machine *machine, int channel, int perc { if (channel==1) { - const device_config *ym = devtag_get_device(machine, SOUND, "ym"); + const device_config *ym = devtag_get_device(machine, "ym"); sound_set_output_gain(ym, 0, percent / 100.0); sound_set_output_gain(ym, 1, percent / 100.0); sound_set_output_gain(ym, 2, percent / 100.0); diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index e4c5530e828..3c2d4f0bc7d 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -848,7 +848,7 @@ static INT32 oki_bank = 0; static void reset_driveout_sound_region(running_machine *machine) { - okim6295_set_bank_base(devtag_get_device(machine, SOUND, "oki"), oki_bank*0x40000); + okim6295_set_bank_base(devtag_get_device(machine, "oki"), oki_bank*0x40000); } static WRITE8_HANDLER (oki_bank_w) @@ -1668,7 +1668,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -1677,7 +1677,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan */ @@ -1693,27 +1693,27 @@ static ADDRESS_MAP_START( camltrya_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x9001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xb000, 0xb000) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0xb000, 0xb000) AM_DEVREAD("oki", okim6295_r) ADDRESS_MAP_END static ADDRESS_MAP_START( camltrya_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) // AM_RANGE(0xb000, 0xb000) AM_WRITE(unknown_w) // probably controlling sample player? - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xb001, 0xb001) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END static ADDRESS_MAP_START( driveout_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_r) AM_RANGE(0xa000, 0xa000) AM_READ(driveout_sound_command_r) ADDRESS_MAP_END @@ -1721,7 +1721,7 @@ static ADDRESS_MAP_START( driveout_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END /*********************************************************** diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 95d6813738d..de7dc4c6a09 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -3638,7 +3638,7 @@ static WRITE32_DEVICE_HANDLER( bubsympb_oki_w ) static DRIVER_INIT( bubsympb ) { - const device_config *oki = devtag_get_device(machine, SOUND, "oki"); + const device_config *oki = devtag_get_device(machine, "oki"); f3_game=BUBSYMPH; //tile_decode(machine); diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 0d88ec0f0c2..e209eec9046 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -331,7 +331,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -340,7 +340,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan control */ diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index c6b35508e8a..c304a6b0d72 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -665,11 +665,11 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) AM_RANGE(0xff08, 0xff08) AM_WRITE(rombankswitch_w) #define COMMON_SINGLE_READ \ - AM_RANGE(0xa000, 0xa003) AM_DEVREAD(SOUND, "ym", extport_select_and_ym2203_r) \ + AM_RANGE(0xa000, 0xa003) AM_DEVREAD("ym", extport_select_and_ym2203_r) \ AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) #define COMMON_SINGLE_WRITE \ - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym2203_w) \ + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym2203_w) \ AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) @@ -716,7 +716,7 @@ static ADDRESS_MAP_START( fhawk_3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym", ym2203_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -724,7 +724,7 @@ static ADDRESS_MAP_START( fhawk_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xf001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym", ym2203_w) ADDRESS_MAP_END static ADDRESS_MAP_START( raimais_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -763,7 +763,7 @@ static ADDRESS_MAP_START( raimais_3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -779,7 +779,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static ADDRESS_MAP_START( raimais_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan */ @@ -832,7 +832,7 @@ static ADDRESS_MAP_START( champwr_3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0x9001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -840,13 +840,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(champwr_msm5205_hi_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(champwr_msm5205_lo_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "msm", champwr_msm5205_start_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "msm", champwr_msm5205_stop_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("msm", champwr_msm5205_start_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", champwr_msm5205_stop_w) ADDRESS_MAP_END @@ -871,7 +871,7 @@ static ADDRESS_MAP_START( kurikint_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe801) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xe800, 0xe801) AM_DEVREAD("ym", ym2203_r) #if 0 AM_RANGE(0xd000, 0xd000) AM_READ_PORT("DSWA") AM_RANGE(0xd001, 0xd001) AM_READ_PORT("DSWB") @@ -885,7 +885,7 @@ static ADDRESS_MAP_START( kurikint_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe801) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVWRITE("ym", ym2203_w) #if 0 AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w) #endif @@ -1034,7 +1034,7 @@ static ADDRESS_MAP_START( evilston_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe801) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xe800, 0xe801) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK7) ADDRESS_MAP_END @@ -1042,7 +1042,7 @@ static ADDRESS_MAP_START( evilston_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe801) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVWRITE("ym", ym2203_w) ADDRESS_MAP_END @@ -2050,7 +2050,7 @@ static const ym2203_interface ym2203_interface_champwr = DEVCB_NULL, DEVCB_NULL, DEVCB_HANDLER(portA_w), - DEVCB_DEVICE_HANDLER(SOUND, "msm", champwr_msm5205_volume_w), + DEVCB_DEVICE_HANDLER("msm", champwr_msm5205_volume_w), }, irqhandler }; diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 8923aa9f7d2..77cd0baf0c6 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -522,7 +522,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -531,7 +531,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan */ @@ -544,7 +544,7 @@ static ADDRESS_MAP_START( daisenpu_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xe000, 0xe001) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -553,7 +553,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daisenpu_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xe000, 0xe001) AM_DEVWRITE("ym", ym2151_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(SMH_NOP) /* pan */ @@ -566,7 +566,7 @@ static ADDRESS_MAP_START( ballbros_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) 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) @@ -576,7 +576,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ballbros_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(SMH_NOP) /* pan */ diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index cb7f088abaf..bef2a2684bd 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1494,7 +1494,7 @@ static WRITE8_HANDLER( taitoz_pancontrol ) // taitoz_pandata[offset] = data; // popmessage(" pan %02x %02x %02x %02x", taitoz_pandata[0], taitoz_pandata[1], taitoz_pandata[2], taitoz_pandata[3] ); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, fltname[offset & 3]), data / 255.0f); + flt_volume_set_volume(devtag_get_device(space->machine, fltname[offset & 3]), data / 255.0f); } static WRITE16_HANDLER( spacegun_pancontrol ) @@ -1699,7 +1699,7 @@ static ADDRESS_MAP_START( bshark_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0x600007) AM_DEVREAD8(SOUND, "ym", ym2610_r, 0x00ff) + AM_RANGE(0x600000, 0x600007) AM_DEVREAD8("ym", ym2610_r, 0x00ff) 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" */ @@ -1710,7 +1710,7 @@ static ADDRESS_MAP_START( bshark_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM) AM_RANGE(0x110000, 0x113fff) AM_WRITE(sharedram_w) AM_RANGE(0x400000, 0x400007) AM_WRITE(spacegun_pancontrol) /* pan */ - AM_RANGE(0x600000, 0x600007) AM_DEVWRITE8(SOUND, "ym", ym2610_w, 0x00ff) + AM_RANGE(0x600000, 0x600007) AM_DEVWRITE8("ym", ym2610_w, 0x00ff) 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" */ @@ -1876,7 +1876,7 @@ static ADDRESS_MAP_START( spacegun_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0xc00007) AM_DEVREAD8(SOUND, "ym", ym2610_r, 0x00ff) + AM_RANGE(0xc00000, 0xc00007) AM_DEVREAD8("ym", ym2610_r, 0x00ff) 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) @@ -1887,7 +1887,7 @@ static ADDRESS_MAP_START( spacegun_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) 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, 0xc00007) AM_DEVWRITE8(SOUND, "ym", ym2610_w, 0x00ff) + AM_RANGE(0xc00000, 0xc00007) AM_DEVWRITE8("ym", ym2610_w, 0x00ff) AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(SMH_NOP) // interrupt controller? AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(SMH_NOP) AM_RANGE(0xc20000, 0xc20007) AM_WRITE(spacegun_pancontrol) /* pan */ @@ -1993,7 +1993,7 @@ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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, 0xe003) AM_DEVREAD(SOUND, "ym", ym2610_r) + AM_RANGE(0xe000, 0xe003) AM_DEVREAD("ym", ym2610_r) AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) @@ -2002,7 +2002,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe003) AM_DEVWRITE(SOUND, "ym", ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVWRITE("ym", ym2610_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(taitoz_pancontrol) /* pan */ diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 3ee149b807d..cbaa54724b8 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -399,7 +399,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_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(SMH_NOP) /* pan control */ diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index ce36123092e..89c13492579 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -220,8 +220,8 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2") AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3") /* Service */ AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4") - AM_RANGE(0xd40e, 0xd40f) AM_MIRROR(0x00f0) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_DEVREAD(SOUND, "ay1", ay8910_r) /* DSW2 and DSW3 */ + AM_RANGE(0xd40e, 0xd40f) AM_MIRROR(0x00f0) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_DEVREAD("ay1", ay8910_r) /* DSW2 and DSW3 */ 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) @@ -260,8 +260,8 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2") AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3") /* Service */ AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4") - AM_RANGE(0xd40e, 0xd40f) AM_MIRROR(0x00f0) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_DEVREAD(SOUND, "ay1", ay8910_r) /* DSW2 and DSW3 */ + AM_RANGE(0xd40e, 0xd40f) AM_MIRROR(0x00f0) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_DEVREAD("ay1", ay8910_r) /* DSW2 and DSW3 */ 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) @@ -326,8 +326,8 @@ static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2") AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3") /* Service */ AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4") - AM_RANGE(0xd40e, 0xd40f) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xd40f, 0xd40f) AM_DEVREAD(SOUND, "ay1", ay8910_r) /* DSW2 and DSW3 */ + AM_RANGE(0xd40e, 0xd40f) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xd40f, 0xd40f) AM_DEVREAD("ay1", ay8910_r) /* DSW2 and DSW3 */ AM_RANGE(0xd508, 0xd508) AM_WRITE(taitosj_collision_reg_clear_w) AM_RANGE(0xd509, 0xd50a) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_gfxpointer) AM_RANGE(0xd50b, 0xd50b) AM_WRITE(taitosj_soundcommand_w) @@ -342,12 +342,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( taitosj_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x4800, 0x4801) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x4801, 0x4801) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x4802, 0x4803) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) - AM_RANGE(0x4803, 0x4803) AM_DEVREAD(SOUND, "ay3", ay8910_r) - AM_RANGE(0x4804, 0x4805) AM_DEVWRITE(SOUND, "ay4", ay8910_address_data_w) - AM_RANGE(0x4805, 0x4805) AM_DEVREAD(SOUND, "ay4", ay8910_r) + AM_RANGE(0x4800, 0x4801) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x4801, 0x4801) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x4802, 0x4803) AM_DEVWRITE("ay3", ay8910_address_data_w) + AM_RANGE(0x4803, 0x4803) AM_DEVREAD("ay3", ay8910_r) + AM_RANGE(0x4804, 0x4805) AM_DEVWRITE("ay4", ay8910_address_data_w) + AM_RANGE(0x4805, 0x4805) AM_DEVREAD("ay4", ay8910_r) AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostic ROM */ ADDRESS_MAP_END @@ -1791,8 +1791,8 @@ static const ay8910_interface ay8910_interface_2 = AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "dac", dac_out_w), /* port Awrite */ - DEVCB_DEVICE_HANDLER(SOUND, "dac", dac_vol_w) /* port Bwrite */ + DEVCB_DEVICE_HANDLER("dac", dac_out_w), /* port Awrite */ + DEVCB_DEVICE_HANDLER("dac", dac_vol_w) /* port Bwrite */ }; static const ay8910_interface ay8910_interface_3 = diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 984b6eb8a93..ba2d50ff2f1 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -436,22 +436,22 @@ static ADDRESS_MAP_START( taitowlf_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START(taitowlf_io, ADDRESS_SPACE_IO, 32) - AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8(DMA8237, "dma8237_1", dma8237_r, dma8237_w, 0xffffffff) - AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8(PIC8259, "pic8259_1", pic8259_r, pic8259_w, 0xffffffff) - AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8(PIT8254, "pit8254", pit8253_r, pit8253_w, 0xffffffff) + AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", dma8237_r, dma8237_w, 0xffffffff) + AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff) + AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff) AM_RANGE(0x0060, 0x006f) AM_READWRITE(kbdc8042_32le_r, kbdc8042_32le_w) AM_RANGE(0x0070, 0x007f) AM_READWRITE(mc146818_port32le_r, mc146818_port32le_w) AM_RANGE(0x0080, 0x009f) AM_READWRITE(at_page32_r, at_page32_w) - AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8(PIC8259, "pic8259_2", pic8259_r, pic8259_w, 0xffffffff) - AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE(DMA8237, "dma8237_2", at32_dma8237_2_r, at32_dma8237_2_w) + AM_RANGE(0x00a0, 0x00bf) AM_DEVREADWRITE8("pic8259_2", pic8259_r, pic8259_w, 0xffffffff) + AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE("dma8237_2", at32_dma8237_2_r, at32_dma8237_2_w) AM_RANGE(0x00e8, 0x00eb) AM_NOP - AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ide_r, ide_w) + AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE("ide", ide_r, ide_w) AM_RANGE(0x0300, 0x03af) AM_NOP AM_RANGE(0x03b0, 0x03df) AM_NOP AM_RANGE(0x0278, 0x027b) AM_WRITE(pnp_config_w) - AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", fdc_r, fdc_w) + AM_RANGE(0x03f0, 0x03ff) AM_DEVREADWRITE("ide", fdc_r, fdc_w) AM_RANGE(0x0a78, 0x0a7b) AM_WRITE(pnp_data_w) - AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE(PCI_BUS, "pcibus", pci_32le_r, pci_32le_w) + AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_32le_r, pci_32le_w) ADDRESS_MAP_END /*****************************************************************************/ @@ -527,11 +527,11 @@ static MACHINE_START(taitowlf) { cpu_set_irq_callback(machine->cpu[0], irq_callback); - taitowlf_devices.pit8254 = device_list_find_by_tag( machine->config->devicelist, PIT8254, "pit8254" ); - taitowlf_devices.pic8259_1 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_1" ); - taitowlf_devices.pic8259_2 = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_2" ); - taitowlf_devices.dma8237_1 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_1" ); - taitowlf_devices.dma8237_2 = device_list_find_by_tag( machine->config->devicelist, DMA8237, "dma8237_2" ); + taitowlf_devices.pit8254 = devtag_get_device( machine, "pit8254" ); + taitowlf_devices.pic8259_1 = devtag_get_device( machine, "pic8259_1" ); + taitowlf_devices.pic8259_2 = devtag_get_device( machine, "pic8259_2" ); + taitowlf_devices.dma8237_1 = devtag_get_device( machine, "dma8237_1" ); + taitowlf_devices.dma8237_2 = devtag_get_device( machine, "dma8237_2" ); } static MACHINE_RESET(taitowlf) @@ -604,8 +604,8 @@ static MACHINE_DRIVER_START(taitowlf) MDRV_MACHINE_RESET(taitowlf) MDRV_PCI_BUS_ADD("pcibus", 0) - MDRV_PCI_BUS_DEVICE(0, NULL, NULL, intel82439tx_pci_r, intel82439tx_pci_w) - MDRV_PCI_BUS_DEVICE(7, NULL, NULL, intel82371ab_pci_r, intel82371ab_pci_w) + MDRV_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w) + MDRV_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w) MDRV_PIT8254_ADD( "pit8254", taitowlf_pit8254_config ) diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c index cbf655469f9..e2ff9acbb90 100644 --- a/src/mame/drivers/tank8.c +++ b/src/mame/drivers/tank8.c @@ -120,13 +120,13 @@ static ADDRESS_MAP_START( tank8_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1c30, 0x1c37) AM_WRITE(tank8_lockout_w) AM_RANGE(0x1d00, 0x1d00) AM_WRITE(tank8_int_reset_w) - AM_RANGE(0x1d01, 0x1d01) AM_DEVWRITE(SOUND, "discrete", tank8_crash_w) - AM_RANGE(0x1d02, 0x1d02) AM_DEVWRITE(SOUND, "discrete", tank8_explosion_w) - AM_RANGE(0x1d03, 0x1d03) AM_DEVWRITE(SOUND, "discrete", tank8_bugle_w) - AM_RANGE(0x1d04, 0x1d04) AM_DEVWRITE(SOUND, "discrete", tank8_bug_w) + AM_RANGE(0x1d01, 0x1d01) AM_DEVWRITE("discrete", tank8_crash_w) + AM_RANGE(0x1d02, 0x1d02) AM_DEVWRITE("discrete", tank8_explosion_w) + AM_RANGE(0x1d03, 0x1d03) AM_DEVWRITE("discrete", tank8_bugle_w) + AM_RANGE(0x1d04, 0x1d04) AM_DEVWRITE("discrete", tank8_bug_w) AM_RANGE(0x1d05, 0x1d05) AM_WRITE(SMH_RAM) AM_BASE(&tank8_team) - AM_RANGE(0x1d06, 0x1d06) AM_DEVWRITE(SOUND, "discrete", tank8_attract_w) - AM_RANGE(0x1e00, 0x1e07) AM_DEVWRITE(SOUND, "discrete", tank8_motor_w) + AM_RANGE(0x1d06, 0x1d06) AM_DEVWRITE("discrete", tank8_attract_w) + AM_RANGE(0x1e00, 0x1e07) AM_DEVWRITE("discrete", tank8_motor_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index 4b1ffe4654a..968ec4fdb0f 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -110,7 +110,7 @@ static WRITE8_HANDLER( tankbatt_interrupt_enable_w ) cpu_set_input_line(space->machine->cpu[0], INPUT_LINE_NMI, CLEAR_LINE); } /* hack - turn off the engine noise if the normal game nmi's are disabled */ - if (data) sample_stop (devtag_get_device(space->machine, SOUND, "samples"), 2); + if (data) sample_stop (devtag_get_device(space->machine, "samples"), 2); // interrupt_enable_w (offset, !data); } @@ -129,14 +129,14 @@ static WRITE8_HANDLER( tankbatt_sh_expl_w ) { if (tankbatt_sound_enable) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); sample_start (samples, 1, 3, 0); } } static WRITE8_HANDLER( tankbatt_sh_engine_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); if (tankbatt_sound_enable) { if (data) @@ -151,7 +151,7 @@ static WRITE8_HANDLER( tankbatt_sh_fire_w ) { if (tankbatt_sound_enable) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); sample_start (samples, 0, 0, 0); } } diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index 6ced616d2e2..1f269767dff 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -213,10 +213,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map_cpu2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "ay2", ay8910_data_w) - AM_RANGE(0x30, 0x30) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_address_w) - AM_RANGE(0x40, 0x40) AM_DEVWRITE(SOUND, "ay1", ay8910_data_w) - AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_address_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay2", ay8910_data_w) + AM_RANGE(0x30, 0x30) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_address_w) + AM_RANGE(0x40, 0x40) AM_DEVWRITE("ay1", ay8910_data_w) + AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index df56418ac79..fc5d8242b48 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -139,7 +139,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0x04, 0x04) AM_WRITE(taotaido_sh_bankswitch_w) AM_RANGE(0x08, 0x08) AM_WRITE(pending_command_clear_w) AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r) diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c index 9ad3a2e699a..ed3e3683700 100644 --- a/src/mame/drivers/targeth.c +++ b/src/mame/drivers/targeth.c @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700008, 0x700009) AM_READ_PORT("SERVICE") /* Service & Guns Reload? */ AM_RANGE(0x70000a, 0x70001b) AM_WRITE(SMH_NOP) /* ??? Guns reload related? */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ - AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) /* OKI6295 status register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) /* OKI6295 status register */ AM_RANGE(0x70002a, 0x70003b) AM_WRITE(targeth_coin_counter_w) /* Coin counters */ AM_RANGE(0xfe0000, 0xfeffff) AM_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 0b45f7ab358..649937833eb 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -223,8 +223,8 @@ static ADDRESS_MAP_START( apache3_v20_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x01fff) AM_RAM AM_RANGE(0x04000, 0x04003) AM_NOP // piu select .. ? AM_RANGE(0x06000, 0x06001) AM_READ_PORT("IN0") // esw - AM_RANGE(0x08000, 0x08001) AM_DEVREADWRITE(SOUND, "ym", tatsumi_hack_ym2151_r, ym2151_w) - AM_RANGE(0x0a000, 0x0a000) AM_DEVREADWRITE(SOUND, "oki", tatsumi_hack_oki_r, okim6295_w) + AM_RANGE(0x08000, 0x08001) AM_DEVREADWRITE("ym", tatsumi_hack_ym2151_r, ym2151_w) + AM_RANGE(0x0a000, 0x0a000) AM_DEVREADWRITE("oki", tatsumi_hack_oki_r, okim6295_w) AM_RANGE(0x0e000, 0x0e007) AM_READWRITE(apache3_adc_r, apache3_adc_w) //adc select AM_RANGE(0xf0000, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -267,8 +267,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( roundup5_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xffef) AM_RAM - AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE(SOUND, "ym", tatsumi_hack_ym2151_r, ym2151_w) - AM_RANGE(0xfff4, 0xfff4) AM_DEVREADWRITE(SOUND, "oki", tatsumi_hack_oki_r, okim6295_w) + AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ym", tatsumi_hack_ym2151_r, ym2151_w) + AM_RANGE(0xfff4, 0xfff4) AM_DEVREADWRITE("oki", tatsumi_hack_oki_r, okim6295_w) AM_RANGE(0xfff8, 0xfff8) AM_READ_PORT("IN0") AM_RANGE(0xfff9, 0xfff9) AM_READ_PORT("IN1") AM_RANGE(0xfffc, 0xfffc) AM_READ_PORT("STICKX") @@ -324,8 +324,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cyclwarr_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xffef) AM_RAM - AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE(SOUND, "ym", tatsumi_hack_ym2151_r, ym2151_w) - AM_RANGE(0xfff4, 0xfff4) AM_DEVREADWRITE(SOUND, "oki", tatsumi_hack_oki_r, okim6295_w) + AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ym", tatsumi_hack_ym2151_r, ym2151_w) + AM_RANGE(0xfff4, 0xfff4) AM_DEVREADWRITE("oki", tatsumi_hack_oki_r, okim6295_w) AM_RANGE(0xfffc, 0xfffc) AM_READ(soundlatch_r) 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 26657090a7d..9ec89a91c5c 100644 --- a/src/mame/drivers/taxidrvr.c +++ b/src/mame/drivers/taxidrvr.c @@ -154,10 +154,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xf480, 0xf483) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) /* "sprite1" placement */ - AM_RANGE(0xf500, 0xf503) AM_DEVREADWRITE(PPI8255, "ppi8255_3", ppi8255_r, ppi8255_w) /* "sprite2" placement */ - AM_RANGE(0xf580, 0xf583) AM_DEVREADWRITE(PPI8255, "ppi8255_4", ppi8255_r, ppi8255_w) /* "sprite3" placement */ + AM_RANGE(0xf400, 0xf403) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xf480, 0xf483) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) /* "sprite1" placement */ + AM_RANGE(0xf500, 0xf503) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) /* "sprite2" placement */ + AM_RANGE(0xf580, 0xf583) AM_DEVREADWRITE("ppi8255_4", ppi8255_r, ppi8255_w) /* "sprite3" placement */ //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_RAM @@ -167,7 +167,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x6000, 0x67ff) AM_RAM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW0") AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSW1") AM_RANGE(0xe002, 0xe002) AM_READ_PORT("DSW2") @@ -183,10 +183,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu3_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x01, 0x01) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x03, 0x03) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x01, 0x01) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x03, 0x03) AM_DEVREAD("ay2", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 3d97f838189..6ef7f75854d 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -163,7 +163,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( tbowl_adpcm_start_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, (offset & 1) ? "msm2" : "msm1"); + const device_config *adpcm = devtag_get_device(space->machine, (offset & 1) ? "msm2" : "msm1"); adpcm_pos[offset & 1] = data << 8; msm5205_reset_w(adpcm,0); } @@ -175,7 +175,7 @@ static WRITE8_HANDLER( tbowl_adpcm_end_w ) static WRITE8_HANDLER( tbowl_adpcm_vol_w ) { - const device_config *adpcm = devtag_get_device(space->machine, SOUND, (offset & 1) ? "msm2" : "msm1"); + const device_config *adpcm = devtag_get_device(space->machine, (offset & 1) ? "msm2" : "msm1"); msm5205_set_volume(adpcm, (data & 0x7f) * 100 / 0x7f); } @@ -202,8 +202,8 @@ static void tbowl_adpcm_int(const device_config *device) static ADDRESS_MAP_START( 6206A_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd001) AM_DEVWRITE(SOUND, "ym1", ym3812_w) - AM_RANGE(0xd800, 0xd801) AM_DEVWRITE(SOUND, "ym2", ym3812_w) + AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ym1", ym3812_w) + AM_RANGE(0xd800, 0xd801) AM_DEVWRITE("ym2", ym3812_w) 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) diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index 9a1b8e7c396..c5220d7f222 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -180,7 +180,7 @@ static ADDRESS_MAP_START( m6809_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(tceptor_tile_ram_w) AM_BASE(&tceptor_tile_ram) AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(tceptor_tile_attr_w) AM_BASE(&tceptor_tile_attr) AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(tceptor_bg_ram_w) AM_BASE(&tceptor_bg_ram) // background (VIEW RAM) - AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r, namcos1_cus30_w) + AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) 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_PORT("PEDAL") // analog input (accel) @@ -200,7 +200,7 @@ static ADDRESS_MAP_START( m6502_a_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0100, 0x01ff) AM_RAM AM_RANGE(0x0200, 0x02ff) AM_RAM AM_RANGE(0x0300, 0x030f) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x3000, 0x30ff) AM_RAM AM_SHARE(3) AM_RANGE(0x3c01, 0x3c01) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -210,7 +210,7 @@ ADDRESS_MAP_END 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_DEVWRITE(SOUND, "dac", voice_w) // voice data + AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("dac", voice_w) // voice data AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_RAM) // voice ctrl?? AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -231,7 +231,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x001f) AM_READWRITE(hd63701_internal_registers_r, hd63701_internal_registers_w) AM_RANGE(0x0080, 0x00ff) AM_RAM - AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE(SOUND, "namco", namcos1_cus30_r, namcos1_cus30_w) AM_BASE(&namco_wavedata) + AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) AM_BASE(&namco_wavedata) AM_RANGE(0x1400, 0x154d) AM_RAM AM_RANGE(0x17c0, 0x17ff) AM_RAM AM_RANGE(0x2000, 0x20ff) AM_RAM AM_SHARE(3) diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 7f8bfeb87b7..c71db5c6280 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -196,10 +196,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rygar_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "msm", tecmo_adpcm_start_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("msm", tecmo_adpcm_start_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(tecmo_adpcm_end_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "msm", tecmo_adpcm_vol_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", tecmo_adpcm_vol_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* NMI acknowledge */ ADDRESS_MAP_END @@ -214,10 +214,10 @@ static ADDRESS_MAP_START( tecmo_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) /* writes code to this area */ AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa001) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE(SOUND, "msm", tecmo_adpcm_start_w) + AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("msm", tecmo_adpcm_start_w) AM_RANGE(0xc400, 0xc400) AM_WRITE(tecmo_adpcm_end_w) - AM_RANGE(0xc800, 0xc800) AM_DEVWRITE(SOUND, "msm", tecmo_adpcm_vol_w) + AM_RANGE(0xc800, 0xc800) AM_DEVWRITE("msm", tecmo_adpcm_vol_w) 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 59a915c1522..17ca7086f9c 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -148,8 +148,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xfbff) AM_READ(SMH_RAM) /* Sound RAM */ - AM_RANGE(0xfc00, 0xfc00) AM_DEVREAD(SOUND, "oki", okim6295_r) - AM_RANGE(0xfc04, 0xfc05) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xfc00, 0xfc00) AM_DEVREAD("oki", okim6295_r) + AM_RANGE(0xfc04, 0xfc05) AM_DEVREAD("ym", ym2151_r) AM_RANGE(0xfc08, 0xfc08) AM_READ(soundlatch_r) AM_RANGE(0xfc0c, 0xfc0c) AM_READ(SMH_NOP) AM_RANGE(0xfffe, 0xffff) AM_READ(SMH_RAM) @@ -158,8 +158,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xfbff) AM_WRITE(SMH_RAM) /* Sound RAM */ - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE(SOUND, "oki", okim6295_w) - AM_RANGE(0xfc04, 0xfc05) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("oki", okim6295_w) + AM_RANGE(0xfc04, 0xfc05) AM_DEVWRITE("ym", ym2151_w) 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 571bd4c4b94..4fa6ade2af4 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -566,13 +566,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(SOUND, "ymf", ymf262_r, ymf262_w) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymf", ymf262_r, ymf262_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("oki", okim6295_w) AM_RANGE(0x20, 0x20) AM_WRITE(tecmosys_oki_bank_w) AM_RANGE(0x30, 0x30) AM_WRITE(deroon_bankswitch_w) AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r) AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch2_w) - AM_RANGE(0x60, 0x61) AM_DEVREADWRITE(SOUND, "ymz", ymz280b_r, ymz280b_w) + AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ymz", ymz280b_r, ymz280b_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index 172f294eda8..2ee894567e9 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -272,7 +272,7 @@ ADDRESS_MAP_END 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_DEVWRITE(SOUND, "msm", msm_reset_w)/* MSM51xx reset */ + AM_RANGE(0x8001, 0x8001) AM_DEVWRITE("msm", msm_reset_w)/* MSM51xx reset */ 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) @@ -280,10 +280,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_data_address_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_data_address_w) + AM_RANGE(0x00, 0x00) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index eb1ca8e7889..0cbc9375db2 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -396,14 +396,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4800, 0x4800) AM_WRITE(avgdvg_go_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(wdclr_w) AM_RANGE(0x5800, 0x5800) AM_WRITE(avgdvg_reset_w) - AM_RANGE(0x6000, 0x603f) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_w) - AM_RANGE(0x6040, 0x6040) AM_DEVREAD(MATHBOX, "mathbox", mathbox_status_r) AM_DEVWRITE(ATARIVGEAROM, "earom", atari_vg_earom_ctrl_w) - AM_RANGE(0x6050, 0x6050) AM_DEVREAD(ATARIVGEAROM, "earom", atari_vg_earom_r) - AM_RANGE(0x6060, 0x6060) AM_DEVREAD(MATHBOX, "mathbox", mathbox_lo_r) - AM_RANGE(0x6070, 0x6070) AM_DEVREAD(MATHBOX, "mathbox", mathbox_hi_r) - AM_RANGE(0x6080, 0x609f) AM_DEVWRITE(MATHBOX, "mathbox", mathbox_go_w) - AM_RANGE(0x60c0, 0x60cf) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x60d0, 0x60df) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x6000, 0x603f) AM_DEVWRITE("earom", atari_vg_earom_w) + AM_RANGE(0x6040, 0x6040) AM_DEVREAD("mathbox", mathbox_status_r) AM_DEVWRITE("earom", atari_vg_earom_ctrl_w) + AM_RANGE(0x6050, 0x6050) AM_DEVREAD("earom", atari_vg_earom_r) + AM_RANGE(0x6060, 0x6060) AM_DEVREAD("mathbox", mathbox_lo_r) + AM_RANGE(0x6070, 0x6070) AM_DEVREAD("mathbox", mathbox_hi_r) + AM_RANGE(0x6080, 0x609f) AM_DEVWRITE("mathbox", mathbox_go_w) + AM_RANGE(0x60c0, 0x60cf) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x60d0, 0x60df) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x60e0, 0x60e0) AM_WRITE(tempest_led_w) AM_RANGE(0x9000, 0xdfff) AM_ROM AM_RANGE(0xf000, 0xffff) AM_ROM /* for the reset / interrupt vectors */ diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c index a6be5183ade..1d32796d4ac 100644 --- a/src/mame/drivers/terracre.c +++ b/src/mame/drivers/terracre.c @@ -266,18 +266,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_3526_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym3526_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "dac1", dac_signed_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "dac2", dac_signed_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3526_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_signed_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_clear_r) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_2203_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x02, 0x02) AM_DEVWRITE(SOUND, "dac1", dac_signed_w) - AM_RANGE(0x03, 0x03) AM_DEVWRITE(SOUND, "dac2", dac_signed_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_signed_w) + AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac2", dac_signed_w) AM_RANGE(0x04, 0x04) AM_READ(soundlatch_clear_r) AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index 32cefa86f7c..ae5eef62725 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -320,7 +320,7 @@ static ADDRESS_MAP_START( tetrisp2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot) // Rotation AM_RANGE(0x650000, 0x651fff) AM_RAM_WRITE(tetrisp2_vram_rot_w) // Rotation (mirror) - AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound + AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound AM_RANGE(0x900000, 0x903fff) AM_READWRITE(tetrisp2_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size) // NVRAM AM_RANGE(0x904000, 0x907fff) AM_READWRITE(tetrisp2_nvram_r, tetrisp2_nvram_w) // NVRAM (mirror) AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w) // Coin Counter @@ -380,7 +380,7 @@ static ADDRESS_MAP_START( nndmseal_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot ) // Rotation AM_RANGE(0x650000, 0x651fff) AM_RAM_WRITE(tetrisp2_vram_rot_w) // Rotation (mirror) - AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) // Sound + AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) // Sound AM_RANGE(0x900000, 0x903fff) AM_READWRITE(tetrisp2_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size ) // NVRAM @@ -423,7 +423,7 @@ static ADDRESS_MAP_START( rockn1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot) // Rotation AM_RANGE(0x900000, 0x903fff) AM_READWRITE(rockn_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume - AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound + AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READWRITE(rockn_adpcmbank_r, rockn_adpcmbank_w) // Sound Bank AM_RANGE(0xa48000, 0xa48001) AM_NOP // YMZ280 Reset AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w) // Coin Counter @@ -457,7 +457,7 @@ static ADDRESS_MAP_START( rockn2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? AM_RANGE(0x900000, 0x903fff) AM_READWRITE(rockn_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume - AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound + AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READWRITE(rockn_adpcmbank_r, rockn2_adpcmbank_w) // Sound Bank AM_RANGE(0xa48000, 0xa48001) AM_WRITENOP // YMZ280 Reset AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w) // Coin Counter @@ -491,7 +491,7 @@ static ADDRESS_MAP_START( rocknms_main_map, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? AM_RANGE(0x900000, 0x903fff) AM_READWRITE(rockn_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume - AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8(SOUND, "ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound + AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READWRITE(rockn_adpcmbank_r, rockn_adpcmbank_w) // Sound Bank AM_RANGE(0xa48000, 0xa48001) AM_WRITENOP // YMZ280 Reset AM_RANGE(0xa00000, 0xa00001) AM_WRITE(rocknms_main2sub_w) // MAIN -> SUB Communication @@ -526,7 +526,7 @@ static ADDRESS_MAP_START( rocknms_sub_map, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? AM_RANGE(0x900000, 0x907fff) AM_RAM // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w) // Sound Volume - AM_RANGE(0xa40000, 0xa40003) AM_DEVWRITE8(SOUND, "ymz", ymz280b_w, 0x00ff) // Sound + AM_RANGE(0xa40000, 0xa40003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // Sound AM_RANGE(0xa44000, 0xa44001) AM_WRITE(rockn_adpcmbank_w) // Sound Bank AM_RANGE(0xa48000, 0xa48001) AM_WRITENOP // YMZ280 Reset AM_RANGE(0xb00000, 0xb00001) AM_WRITE(rocknms_sub2main_w) // MAIN <- SUB Communication diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index 592993e7c95..60fde932860 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -715,7 +715,7 @@ INPUT_PORTS_END static MACHINE_START( thayers ) { - laserdisc = device_list_find_by_tag(machine->config->devicelist, LASERDISC, "laserdisc"); + laserdisc = devtag_get_device(machine, "laserdisc"); memset(&ssi263, 0, sizeof(ssi263)); } diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index b269c641f15..4d928a909bb 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -179,7 +179,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0801) AM_DEVWRITE(SOUND, "ym", ym2203_w ) // + AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym", ym2203_w ) // AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r ) // From Main CPU AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index b8e70cfa953..5f1e00ed155 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -216,10 +216,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0x8c, 0x8d) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x8d, 0x8d) AM_DEVREAD(SOUND, "ay2", ay8910_r) - AM_RANGE(0x8e, 0x8f) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x8f, 0x8f) AM_DEVREAD(SOUND, "ay1", ay8910_r) + AM_RANGE(0x8c, 0x8d) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x8d, 0x8d) AM_DEVREAD("ay2", ay8910_r) + AM_RANGE(0x8e, 0x8f) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x8f, 0x8f) AM_DEVREAD("ay1", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c index b265ef76bfb..a53181d240e 100644 --- a/src/mame/drivers/thief.c +++ b/src/mame/drivers/thief.c @@ -192,11 +192,11 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) 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 */ - AM_RANGE(0x33, 0x33) AM_DEVWRITE(SOUND, "samples", tape_control_w) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x41, 0x41) AM_DEVREAD(SOUND, "ay1", ay8910_r) - AM_RANGE(0x42, 0x43) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x43, 0x43) AM_DEVREAD(SOUND, "ay2", ay8910_r) + AM_RANGE(0x33, 0x33) AM_DEVWRITE("samples", tape_control_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x41, 0x41) AM_DEVREAD("ay1", ay8910_r) + AM_RANGE(0x42, 0x43) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x43, 0x43) AM_DEVREAD("ay2", ay8910_r) AM_RANGE(0x50, 0x50) AM_WRITE(thief_color_plane_w) AM_RANGE(0x60, 0x6f) AM_WRITE(thief_vtcsel_w) AM_RANGE(0x70, 0x7f) AM_WRITE(thief_color_map_w) diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c index 7492a1ebb9d..57544b420cd 100644 --- a/src/mame/drivers/thoop2.c +++ b/src/mame/drivers/thoop2.c @@ -64,7 +64,7 @@ static ADDRESS_MAP_START( thoop2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1") AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2") AM_RANGE(0x700008, 0x700009) AM_READ_PORT("SYSTEM") - AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff)/* OKI6295 status register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREAD8("oki", okim6295_r, 0x00ff)/* OKI6295 status register */ AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END @@ -104,7 +104,7 @@ static ADDRESS_MAP_START( thoop2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) /* OKI6295 data register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) /* OKI6295 data register */ AM_RANGE(0x70000a, 0x70005b) AM_WRITE(thoop2_coin_w) /* Coin Counters + Coin Lockout */ AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 70d9431b0e4..a250e29f71b 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -431,29 +431,29 @@ static ADDRESS_MAP_START( scontra_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREAD(SOUND, "konami", k007232_r) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) /* YM2151 */ + AM_RANGE(0xb000, 0xb00d) AM_DEVREAD("konami", k007232_r) /* 007232 registers */ + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( scontra_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ - AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE(SOUND, "konami", k007232_w) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) /* YM2151 */ - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE(SOUND, "konami", scontra_snd_bankswitch_w) /* 007232 bank select */ + AM_RANGE(0xb000, 0xb00d) AM_DEVWRITE("konami", k007232_w) /* 007232 registers */ + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) /* YM2151 */ + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", scontra_snd_bankswitch_w) /* 007232 bank select */ ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) 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(0xc000, 0xc001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0xc000, 0xc001) AM_DEVREAD("ym", ym2151_r) ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ym", ym2151_w) ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index ca87fd01742..031c32e5e86 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -215,10 +215,10 @@ static ADDRESS_MAP_START( tickee_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0) AM_RANGE(0x04000000, 0x04003fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x04100000, 0x041000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w) - AM_RANGE(0x04200000, 0x0420000f) AM_DEVREAD8(SOUND, "ym1", ay8910_r, 0x00ff) - AM_RANGE(0x04200000, 0x0420001f) AM_DEVWRITE8(SOUND, "ym1", ay8910_address_data_w, 0x00ff) - AM_RANGE(0x04200100, 0x0420010f) AM_DEVREAD8(SOUND, "ym2", ay8910_r, 0x00ff) - AM_RANGE(0x04200100, 0x0420011f) AM_DEVWRITE8(SOUND, "ym2", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x04200000, 0x0420000f) AM_DEVREAD8("ym1", ay8910_r, 0x00ff) + AM_RANGE(0x04200000, 0x0420001f) AM_DEVWRITE8("ym1", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x04200100, 0x0420010f) AM_DEVREAD8("ym2", ay8910_r, 0x00ff) + AM_RANGE(0x04200100, 0x0420011f) AM_DEVWRITE8("ym2", ay8910_address_data_w, 0x00ff) AM_RANGE(0x04400000, 0x0440007f) AM_WRITE(tickee_control_w) AM_BASE(&tickee_control) AM_RANGE(0x04400040, 0x0440004f) AM_READ_PORT("IN2") AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) @@ -233,10 +233,10 @@ static ADDRESS_MAP_START( ghoshunt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0) AM_RANGE(0x04100000, 0x04103fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x04200000, 0x042000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w) - AM_RANGE(0x04300000, 0x0430000f) AM_DEVREAD8(SOUND, "ym1", ay8910_r, 0x00ff) - AM_RANGE(0x04300000, 0x0430001f) AM_DEVWRITE8(SOUND, "ym1", ay8910_address_data_w, 0x00ff) - AM_RANGE(0x04300100, 0x0430010f) AM_DEVREAD8(SOUND, "ym2", ay8910_r, 0x00ff) - AM_RANGE(0x04300100, 0x0430011f) AM_DEVWRITE8(SOUND, "ym2", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x04300000, 0x0430000f) AM_DEVREAD8("ym1", ay8910_r, 0x00ff) + AM_RANGE(0x04300000, 0x0430001f) AM_DEVWRITE8("ym1", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x04300100, 0x0430010f) AM_DEVREAD8("ym2", ay8910_r, 0x00ff) + AM_RANGE(0x04300100, 0x0430011f) AM_DEVWRITE8("ym2", ay8910_address_data_w, 0x00ff) AM_RANGE(0x04500000, 0x0450007f) AM_WRITE(tickee_control_w) AM_BASE(&tickee_control) AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) AM_RANGE(0xc0000240, 0xc000025f) AM_WRITENOP /* seems to be a bug in their code */ diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index 209f558e64a..d42309cd7e0 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -191,8 +191,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -209,7 +209,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sample_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch2_r) - AM_RANGE(0x01, 0x01) AM_DEVWRITE(SOUND, "msm", msm5205_w) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm", msm5205_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c index bee68841bf1..c14ab2f2ee3 100644 --- a/src/mame/drivers/timelimt.c +++ b/src/mame/drivers/timelimt.c @@ -101,8 +101,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0x8c, 0x8d) AM_DEVREADWRITE(SOUND, "ay1", ay8910_r, ay8910_address_data_w) - AM_RANGE(0x8e, 0x8f) AM_DEVREADWRITE(SOUND, "ay2", ay8910_r, ay8910_address_data_w) + AM_RANGE(0x8c, 0x8d) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_address_data_w) + AM_RANGE(0x8e, 0x8f) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_address_data_w) ADDRESS_MAP_END /***************************************************************************/ diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index b127703d517..42fa11ac36a 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -441,9 +441,9 @@ static ADDRESS_MAP_START( tmaster_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x300010, 0x300011 ) AM_READ( tmaster_coins_r ) - AM_RANGE( 0x300020, 0x30003f ) AM_DEVREADWRITE8( DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff ) + AM_RANGE( 0x300020, 0x30003f ) AM_DEVREADWRITE8( "duart68681", duart68681_r, duart68681_w, 0xff ) - AM_RANGE( 0x300040, 0x300041 ) AM_DEVWRITE( SOUND, "oki", tmaster_oki_bank_w ) + AM_RANGE( 0x300040, 0x300041 ) AM_DEVWRITE( "oki", tmaster_oki_bank_w ) AM_RANGE( 0x300070, 0x300071 ) AM_WRITE( tmaster_addr_w ) @@ -454,7 +454,7 @@ static ADDRESS_MAP_START( tmaster_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x600000, 0x600fff ) AM_READWRITE( SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w ) AM_BASE(&paletteram16) // looks like palettes, maybe - AM_RANGE( 0x800000, 0x800001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0x800000, 0x800001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE( 0x800010, 0x800011 ) AM_WRITE( tmaster_color_w ) ADDRESS_MAP_END @@ -617,7 +617,7 @@ static ADDRESS_MAP_START( galgames_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x800020, 0x80003f ) AM_NOP // ? AM_RANGE( 0x900000, 0x900001 ) AM_WRITE( watchdog_reset16_w ) - AM_RANGE( 0xa00000, 0xa00001 ) AM_DEVREADWRITE8( SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE( 0xa00000, 0xa00001 ) AM_DEVREADWRITE8( "oki", okim6295_r, okim6295_w, 0x00ff ) AM_RANGE( 0xb00000, 0xb7ffff ) AM_READWRITE( galgames_okiram_r, galgames_okiram_w ) // (only low bytes tested) 4x N341024SJ-15 AM_RANGE( 0xc00000, 0xc00001 ) AM_WRITE( galgames_palette_offset_w ) @@ -750,7 +750,7 @@ static MACHINE_START( tmaster ) static MACHINE_RESET( tmaster ) { - tmaster_devices.duart68681 = device_list_find_by_tag( machine->config->devicelist, DUART68681, "duart68681" ); + tmaster_devices.duart68681 = devtag_get_device( machine, "duart68681" ); } static INTERRUPT_GEN( tm3k_interrupt ) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 3a27ee3557e..bd23e203736 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -248,8 +248,8 @@ static READ8_HANDLER( tmnt_sres_r ) static WRITE8_HANDLER( tmnt_sres_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); - const device_config *upd = devtag_get_device(space->machine, SOUND, "upd"); + const device_config *samples = devtag_get_device(space->machine, "samples"); + const device_config *upd = devtag_get_device(space->machine, "upd"); /* bit 1 resets the UPD7795C sound chip */ upd7759_reset_w(upd, data & 2); @@ -661,7 +661,7 @@ static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3") AM_RANGE(0x0b0000, 0x0b03ff) AM_READWRITE(cuebrick_nv_r, cuebrick_nv_w) AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrick_nvbank_w) - AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0xff00) + AM_RANGE(0x0c0000, 0x0c0003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0xff00) AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) @@ -720,8 +720,8 @@ static ADDRESS_MAP_START( punkshot_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P3/P4") AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("P1/P2") AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE(punkshot_0a0020_w) - AM_RANGE(0x0a0040, 0x0a0043) AM_DEVREAD8(SOUND, "konami", punkshot_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x0a0040, 0x0a0041) AM_DEVWRITE8(SOUND, "konami", k053260_w, 0x00ff) + AM_RANGE(0x0a0040, 0x0a0043) AM_DEVREAD8("konami", punkshot_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x0a0040, 0x0a0041) AM_DEVWRITE8("konami", k053260_w, 0x00ff) AM_RANGE(0x0a0060, 0x0a007f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x0a0080, 0x0a0081) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, punkshot_K052109_word_noA12_w) @@ -742,8 +742,8 @@ static ADDRESS_MAP_START( lgtnfght_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0008, 0x0a0009) AM_READ_PORT("DSW2") AM_RANGE(0x0a0010, 0x0a0011) AM_READ_PORT("DSW3") AM_RANGE(0x0a0018, 0x0a0019) AM_WRITE(lgtnfght_0a0018_w) - AM_RANGE(0x0a0020, 0x0a0023) AM_DEVREAD8(SOUND, "konami", punkshot_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x0a0020, 0x0a0021) AM_DEVWRITE8(SOUND, "konami", k053260_w, 0x00ff) + AM_RANGE(0x0a0020, 0x0a0023) AM_DEVREAD8("konami", punkshot_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x0a0020, 0x0a0021) AM_DEVWRITE8("konami", k053260_w, 0x00ff) AM_RANGE(0x0a0028, 0x0a0029) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x0b0000, 0x0b3fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) AM_RANGE(0x0c0000, 0x0c001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) @@ -773,8 +773,8 @@ static ADDRESS_MAP_START( blswhstl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700200, 0x700201) AM_WRITE(blswhstl_eeprom_w) AM_RANGE(0x700300, 0x700301) AM_WRITE(blswhstl_700300_w) AM_RANGE(0x700400, 0x700401) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x780600, 0x780603) AM_DEVREAD8(SOUND, "konami", punkshot_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x780600, 0x780601) AM_DEVWRITE8(SOUND, "konami", k053260_w, 0x00ff) + AM_RANGE(0x780600, 0x780603) AM_DEVREAD8("konami", punkshot_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x780600, 0x780601) AM_DEVWRITE8("konami", k053260_w, 0x00ff) AM_RANGE(0x780604, 0x780605) AM_WRITE(ssriders_soundkludge_w) AM_RANGE(0x780700, 0x78071f) AM_WRITE(K053251_lsb_w) ADDRESS_MAP_END @@ -797,7 +797,7 @@ static ADDRESS_MAP_START( glfgreat_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x121000, 0x121001) AM_READ(glfgreat_ball_r) /* returns the color of the center pixel of the roz layer */ AM_RANGE(0x122000, 0x122001) AM_WRITE(glfgreat_122000_w) AM_RANGE(0x124000, 0x124001) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x125000, 0x125003) AM_DEVREADWRITE8(SOUND, "konami", punkshot_sound_r, glfgreat_sound_w, 0xff00) /* K053260 */ + AM_RANGE(0x125000, 0x125003) AM_DEVREADWRITE8("konami", punkshot_sound_r, glfgreat_sound_w, 0xff00) /* K053260 */ AM_RANGE(0x200000, 0x207fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) AM_RANGE(0x300000, 0x3fffff) AM_READ(glfgreat_rom_r) ADDRESS_MAP_END @@ -1074,8 +1074,8 @@ static ADDRESS_MAP_START( tmnt2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) /* protection device */ AM_RANGE(0x1c0800, 0x1c081f) AM_WRITE(tmnt2_1c0800_w) AM_BASE(&tmnt2_1c0800) /* protection device */ AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) - AM_RANGE(0x5c0600, 0x5c0603) AM_DEVREAD8(SOUND, "konami", punkshot_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x5c0600, 0x5c0601) AM_DEVWRITE8(SOUND, "konami", k053260_w, 0x00ff) + AM_RANGE(0x5c0600, 0x5c0603) AM_DEVREAD8("konami", punkshot_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x5c0600, 0x5c0601) AM_DEVWRITE8("konami", k053260_w, 0x00ff) AM_RANGE(0x5c0604, 0x5c0605) AM_WRITE(ssriders_soundkludge_w) AM_RANGE(0x5c0700, 0x5c071f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x600000, 0x603fff) AM_READWRITE(K052109_word_r, K052109_word_w) @@ -1100,8 +1100,8 @@ static ADDRESS_MAP_START( ssriders_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) AM_RANGE(0x1c0800, 0x1c0803) AM_WRITE(ssriders_protection_w) AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) - AM_RANGE(0x5c0600, 0x5c0603) AM_DEVREAD8(SOUND, "konami", punkshot_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x5c0600, 0x5c0601) AM_DEVWRITE8(SOUND, "konami", k053260_w, 0x00ff) + AM_RANGE(0x5c0600, 0x5c0603) AM_DEVREAD8("konami", punkshot_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x5c0600, 0x5c0601) AM_DEVWRITE8("konami", k053260_w, 0x00ff) AM_RANGE(0x5c0604, 0x5c0605) AM_WRITE(ssriders_soundkludge_w) AM_RANGE(0x5c0700, 0x5c071f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x600000, 0x603fff) AM_READWRITE(K052109_word_r, K052109_word_w) @@ -1129,7 +1129,7 @@ static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00200, 0xc00201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ AM_RANGE(0xc00404, 0xc00405) AM_READ_PORT("COINS") AM_RANGE(0xc00406, 0xc00407) AM_READ(sunsetbl_eeprom_r) - AM_RANGE(0xc00600, 0xc00601) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0xc00600, 0xc00601) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x75d288, 0x75d289) AM_READ(SMH_NOP) // read repeatedly in some test menus (PC=181f2) ADDRESS_MAP_END @@ -1139,8 +1139,8 @@ static ADDRESS_MAP_START( thndrx2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30001f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x400000, 0x400003) AM_DEVREAD8(SOUND, "konami", punkshot_sound_r, 0x00ff) /* K053260 */ - AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8(SOUND, "konami", k053260_w, 0x00ff) + AM_RANGE(0x400000, 0x400003) AM_DEVREAD8("konami", punkshot_sound_r, 0x00ff) /* K053260 */ + AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8("konami", k053260_w, 0x00ff) AM_RANGE(0x500000, 0x50003f) AM_READWRITE(K054000_lsb_r, K054000_lsb_w) AM_RANGE(0x500100, 0x500101) AM_WRITE(thndrx2_eeprom_w) AM_RANGE(0x500200, 0x500201) AM_READ(thndrx2_in0_r) @@ -1157,8 +1157,8 @@ static ADDRESS_MAP_START( mia_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) ADDRESS_MAP_END @@ -1167,35 +1167,35 @@ static ADDRESS_MAP_START( tmnt_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_READWRITE(tmnt_sres_r, tmnt_sres_w) /* title music & UPD7759C reset */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "upd", upd7759_port_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "upd", tmnt_upd_start_w) - AM_RANGE(0xf000, 0xf000) AM_DEVREAD(SOUND, "upd", tmnt_upd_busy_r) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("upd", upd7759_port_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("upd", tmnt_upd_start_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREAD("upd", tmnt_upd_busy_r) ADDRESS_MAP_END static ADDRESS_MAP_START( punkshot_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END static ADDRESS_MAP_START( lgtnfght_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xc000, 0xc02f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xc000, 0xc02f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END static ADDRESS_MAP_START( glfgreat_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf82f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xf800, 0xf82f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END @@ -1203,8 +1203,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ssriders_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xfa00, 0xfa2f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xfa00, 0xfa2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w) ADDRESS_MAP_END @@ -1212,9 +1212,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( thndrx2_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x0010) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x0010) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE(SOUND, "konami", k053260_r, k053260_w) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVREADWRITE("konami", k053260_r, k053260_w) ADDRESS_MAP_END @@ -1231,8 +1231,8 @@ static ADDRESS_MAP_START( prmrsocr_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK1, SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe0ff) AM_DEVREADWRITE(SOUND, "konami", k054539_r, k054539_w) - AM_RANGE(0xe100, 0xe12f) AM_DEVREADWRITE(SOUND, "konami", k054539_ctrl_r, k054539_ctrl_w) + AM_RANGE(0xe000, 0xe0ff) AM_DEVREADWRITE("konami", k054539_r, k054539_w) + AM_RANGE(0xe100, 0xe12f) AM_DEVREADWRITE("konami", k054539_ctrl_r, k054539_ctrl_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) @@ -2327,7 +2327,7 @@ MACHINE_DRIVER_END static MACHINE_RESET( tmnt ) { - const device_config *upd = devtag_get_device(machine, SOUND, "upd"); + const device_config *upd = devtag_get_device(machine, "upd"); /* the UPD7759 control flip-flops are cleared: /ST is 1, /RESET is 0 */ upd7759_start_w(upd, 0); upd7759_reset_w(upd, 1); diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index a427b4f94ba..f387fca87d3 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -794,7 +794,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2) - AM_RANGE(0xb000, 0xb001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xb000, 0xb001) AM_DEVREAD("ym", ym2203_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(SMH_RAM) @@ -807,7 +807,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) - AM_RANGE(0xb000, 0xb001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0xc000, 0xc001) AM_WRITE(tnzs_mcu_w) /* not present in insectx */ AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w) @@ -816,7 +816,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kageki_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2) - AM_RANGE(0xb000, 0xb001) AM_DEVREAD(SOUND, "ym", ym2203_r) + AM_RANGE(0xb000, 0xb001) AM_DEVREAD("ym", ym2203_r) AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") @@ -827,7 +827,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kageki_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) - AM_RANGE(0xb000, 0xb001) AM_DEVWRITE(SOUND, "ym", ym2203_w) + AM_RANGE(0xb000, 0xb001) AM_DEVWRITE("ym", ym2203_w) AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w) ADDRESS_MAP_END @@ -884,7 +884,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tnzsb_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -940,7 +940,7 @@ static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK2, SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(jpopnics_subbankswitch_w) - AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN1") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN2") AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSWA") @@ -1597,7 +1597,7 @@ static const ym2203_interface kageki_ym2203_interface = DEVCB_HANDLER(kageki_csport_r), DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER(SOUND, "samples", kageki_csport_w) + DEVCB_DEVICE_HANDLER("samples", kageki_csport_w) }, }; @@ -1619,7 +1619,7 @@ static const ym2203_interface kabukiz_ym2203_interface = DEVCB_NULL, DEVCB_NULL, DEVCB_HANDLER(kabukiz_sound_bank_w), - DEVCB_DEVICE_HANDLER(SOUND, "dac", kabukiz_sample_w) + DEVCB_DEVICE_HANDLER("dac", kabukiz_sample_w) }, irqhandler }; diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 3b63ea11418..39cc6526626 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -282,7 +282,7 @@ static ADDRESS_MAP_START( rallybik_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x30) AM_WRITE(rallybik_coin_w) /* Coin counter/lockout */ AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB") - AM_RANGE(0x60, 0x61) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP") ADDRESS_MAP_END @@ -294,7 +294,7 @@ static ADDRESS_MAP_START( truxton_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB") - AM_RANGE(0x60, 0x61) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x60, 0x61) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP") ADDRESS_MAP_END @@ -307,7 +307,7 @@ static ADDRESS_MAP_START( hellfire_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_READ_PORT("P1") AM_RANGE(0x50, 0x50) AM_READ_PORT("P2") AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM") - AM_RANGE(0x70, 0x71) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) ADDRESS_MAP_END static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -319,12 +319,12 @@ static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x80) AM_READ_PORT("SYSTEM") AM_RANGE(0x88, 0x88) AM_READ_PORT("TJUMP") AM_RANGE(0xa0, 0xa0) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ - AM_RANGE(0xa8, 0xa9) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0xa8, 0xa9) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) ADDRESS_MAP_END static ADDRESS_MAP_START( demonwld_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP") AM_RANGE(0x40, 0x40) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM") @@ -336,7 +336,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( outzone_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x04, 0x04) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0x08, 0x08) AM_READ_PORT("DSWA") AM_RANGE(0x0c, 0x0c) AM_READ_PORT("DSWB") diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 5674f66d1a9..14fd1bfd715 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -634,7 +634,7 @@ static WRITE16_HANDLER( shippumd_coin_word_w ) if (ACCESSING_BITS_0_7) { toaplan2_coin_w(space, offset, data & 0xff); - okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (((data & 0x10) >> 4) * 0x40000)); + okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (((data & 0x10) >> 4) * 0x40000)); } if (ACCESSING_BITS_8_15 && (data & 0xff00) ) { @@ -851,7 +851,7 @@ static WRITE16_HANDLER( dogyuun_snd_cpu_w ) if (ACCESSING_BITS_0_7) { mcu_data = data; - dogyuun_okisnd_w(devtag_get_device(space->machine, SOUND, "oki"), data); + dogyuun_okisnd_w(devtag_get_device(space->machine, "oki"), data); } logerror("PC:%06x Writing command (%04x) to the NEC V25+ secondary CPU port\n",cpu_get_previouspc(space->cpu),mcu_data); } @@ -870,7 +870,7 @@ static WRITE16_HANDLER( kbash_snd_cpu_w ) { if (ACCESSING_BITS_0_7) { - kbash_okisnd_w(devtag_get_device(space->machine, SOUND, "oki"), data); + kbash_okisnd_w(devtag_get_device(space->machine, "oki"), data); } logerror("PC:%06x Writing Sound command (%04x) to the NEC V25+ secondary CPU\n",cpu_get_previouspc(space->cpu),data); } @@ -907,7 +907,7 @@ static WRITE16_HANDLER( fixeight_sec_cpu_w ) if (mcu_data & 0xff00) { mcu_data = (mcu_data & 0xff00) | (data & 0xff); - fixeight_okisnd_w(devtag_get_device(space->machine, SOUND, "oki"), data); + fixeight_okisnd_w(devtag_get_device(space->machine, "oki"), data); } else if (mcu_data == 0xff00) { @@ -951,7 +951,7 @@ static WRITE16_HANDLER( batsugun_snd_cpu_w ) if (ACCESSING_BITS_0_7) { mcu_data = data; - batsugun_okisnd_w(devtag_get_device(space->machine, SOUND, "oki"), data); + batsugun_okisnd_w(devtag_get_device(space->machine, "oki"), data); } logerror("PC:%06x Writing command (%04x) to the NEC V25+ secondary CPU port %02x\n",cpu_get_previouspc(space->cpu),mcu_data,(offset*2)); } @@ -1411,9 +1411,9 @@ static ADDRESS_MAP_START( kbash2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200010, 0x200011) AM_READ_PORT("IN1") AM_RANGE(0x200014, 0x200015) AM_READ_PORT("IN2") AM_RANGE(0x200018, 0x200019) AM_READ_PORT("SYS") - AM_RANGE(0x200020, 0x200021) AM_DEVREADWRITE8(SOUND, "oki2", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x200024, 0x200025) AM_DEVREADWRITE8(SOUND, "oki1", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x200028, 0x200029) AM_DEVWRITE(SOUND, "oki1", oki_bankswitch_w) + AM_RANGE(0x200020, 0x200021) AM_DEVREADWRITE8("oki2", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x200024, 0x200025) AM_DEVREADWRITE8("oki1", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x200028, 0x200029) AM_DEVWRITE("oki1", oki_bankswitch_w) AM_RANGE(0x20002c, 0x20002d) AM_READ(video_count_r) 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 */ @@ -1444,8 +1444,8 @@ static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700006, 0x700007) AM_READ_PORT("IN1") AM_RANGE(0x700008, 0x700009) AM_READ_PORT("IN2") AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("SYS") - AM_RANGE(0x700010, 0x700011) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) - AM_RANGE(0x700014, 0x700017) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x700010, 0x700011) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x700014, 0x700017) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) AM_RANGE(0x70001e, 0x70001f) AM_WRITE(toaplan2_coin_word_w) /* Coin count/lock */ ADDRESS_MAP_END @@ -1546,8 +1546,8 @@ static ADDRESS_MAP_START( fixeighb_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200008, 0x200009) AM_READ_PORT("IN3") AM_RANGE(0x20000c, 0x20000d) AM_READ_PORT("DSWB") AM_RANGE(0x200010, 0x200011) AM_READ_PORT("SYS") - AM_RANGE(0x200014, 0x200015) AM_DEVWRITE(SOUND, "oki", fixeighb_oki_bankswitch_w) /* Sound banking. Code at $4084c, $5070 */ - AM_RANGE(0x200018, 0x200019) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x200014, 0x200015) AM_DEVWRITE("oki", fixeighb_oki_bankswitch_w) /* Sound banking. Code at $4084c, $5070 */ + AM_RANGE(0x200018, 0x200019) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x20001c, 0x20001d) AM_READ_PORT("DSWA") 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 */ @@ -1682,8 +1682,8 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) 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_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x500000, 0x500003) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) - AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x500000, 0x500003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x700000, 0x700001) AM_READ_PORT("JMPR") AM_RANGE(0x700004, 0x700005) AM_READ_PORT("DSWA") AM_RANGE(0x700008, 0x700009) AM_READ_PORT("DSWB") @@ -1692,7 +1692,7 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700014, 0x700015) AM_READ_PORT("IN3") AM_RANGE(0x700018, 0x700019) AM_READ_PORT("IN4") AM_RANGE(0x70001c, 0x70001d) AM_READ_PORT("SYS") - AM_RANGE(0x700030, 0x700031) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) /* Sample bank switch */ + AM_RANGE(0x700030, 0x700031) AM_DEVWRITE("oki", oki_bankswitch_w) /* Sample bank switch */ AM_RANGE(0x700034, 0x700035) AM_WRITE(toaplan2_coin_word_w) /* Coin count/lock */ ADDRESS_MAP_END @@ -1842,15 +1842,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&toaplan2_shared_ram) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) ADDRESS_MAP_END static ADDRESS_MAP_START( raizing_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe00e, 0xe00e) AM_WRITE(toaplan2_coin_w) ADDRESS_MAP_END @@ -1859,8 +1859,8 @@ static ADDRESS_MAP_START( bgaregga_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram) - AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe006, 0xe006) AM_WRITE(raizing_okim6295_bankselect_0) AM_RANGE(0xe008, 0xe008) AM_WRITE(raizing_okim6295_bankselect_1) AM_RANGE(0xe00a, 0xe00a) AM_WRITE(bgaregga_bankswitch_w) @@ -1885,9 +1885,9 @@ static ADDRESS_MAP_START( batrider_sound_z80_port, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x46, 0x46) AM_WRITE(raizing_clear_nmi_w) AM_RANGE(0x48, 0x48) AM_READ(soundlatch_r) AM_RANGE(0x4a, 0x4a) AM_READ(soundlatch2_r) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x82, 0x82) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x84, 0x84) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x82, 0x82) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x84, 0x84) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x88, 0x88) AM_WRITE(batrider_bankswitch_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(raizing_okim6295_bankselect_0) AM_RANGE(0xc2, 0xc2) AM_WRITE(raizing_okim6295_bankselect_1) @@ -1911,7 +1911,7 @@ static ADDRESS_MAP_START( bbakraid_sound_z80_port, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x46, 0x46) AM_WRITE(raizing_clear_nmi_w) AM_RANGE(0x48, 0x48) AM_READ(soundlatch_r) AM_RANGE(0x4a, 0x4a) AM_READ(soundlatch2_r) - AM_RANGE(0x80, 0x81) AM_DEVREADWRITE(SOUND, "ymz", ymz280b_r, ymz280b_w) + AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ymz", ymz280b_r, ymz280b_w) ADDRESS_MAP_END @@ -1931,9 +1931,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( V25_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x03fff) AM_ROM // AM_RANGE(0x00000, 0x007ff) AM_RAM /* External shared RAM (Banked) */ - AM_RANGE(0x04000, 0x04001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x04002, 0x04002) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) -// AM_RANGE(0x04004, 0x04004) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) + AM_RANGE(0x04000, 0x04001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x04002, 0x04002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) +// AM_RANGE(0x04004, 0x04004) AM_DEVWRITE("oki", oki_bankswitch_w) AM_RANGE(0x04008, 0x04008) AM_READ_PORT("IN1") AM_RANGE(0x0400a, 0x0400a) AM_READ_PORT("IN2") AM_RANGE(0x0400c, 0x0400c) AM_READ_PORT("SYS") @@ -1961,7 +1961,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( V25_rambased_mem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x00000, 0x00001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00000, 0x00001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x07800, 0x07fff) AM_RAM AM_SHARE(6) diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index ed7f8e2c0b3..81118d91a99 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -150,9 +150,9 @@ static ADDRESS_MAP_START( tokib_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "msm", toki_adpcm_control_w) /* MSM5205 + ROM bank */ + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", toki_adpcm_control_w) /* MSM5205 + ROM bank */ AM_RANGE(0xe400, 0xe400) AM_WRITE(toki_adpcm_data_w) - AM_RANGE(0xec00, 0xec01) AM_MIRROR(0x0008) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0xec00, 0xec01) AM_MIRROR(0x0008) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 15edfa94401..d1406299f2c 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -259,7 +259,7 @@ static ADDRESS_MAP_START( tomcat_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x803fff) AM_RAM AM_BASE((UINT16**)&vectorram) AM_SIZE(&vectorram_size) AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE(tomcat_shared_ram_r, tomcat_shared_ram_w) AM_RANGE(0xffc000, 0xffcfff) AM_RAM - AM_RANGE(0xffd000, 0xffdfff) AM_DEVREADWRITE8(M48T02, "m48t02", timekeeper_r, timekeeper_w, 0xff00) + AM_RANGE(0xffd000, 0xffdfff) AM_DEVREADWRITE8("m48t02", timekeeper_r, timekeeper_w, 0xff00) AM_RANGE(0xffd000, 0xffdfff) AM_READWRITE8(tomcat_nvram_r, tomcat_nvram_w, 0x00ff) ADDRESS_MAP_END @@ -287,13 +287,13 @@ static WRITE8_HANDLER(soundlatches_w) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x3000, 0x30df) AM_WRITE(soundlatches_w) AM_RANGE(0x30e0, 0x30e0) AM_NOP // COINRD Inputs: D7 = Coin L, D6 = Coin R, D5 = SOUNDFLAG AM_RANGE(0x5000, 0x507f) AM_RAM // 6532 ram - AM_RANGE(0x5080, 0x509f) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w) - AM_RANGE(0x6000, 0x601f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x7000, 0x701f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x5080, 0x509f) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w) + AM_RANGE(0x6000, 0x601f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x7000, 0x701f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x8000, 0xffff) AM_NOP // main sound program rom ADDRESS_MAP_END diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 39f9bd4e049..a0e4a6b3c35 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -510,19 +510,19 @@ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) 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(0x9000, 0x9001) AM_DEVREAD(SOUND, "ym", ym2151_r) + AM_RANGE(0x9000, 0x9001) AM_DEVREAD("ym", ym2151_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(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x9000, 0x9001) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xb000, 0xb000) AM_DEVWRITE(SOUND, "msm", topspeed_msm5205_address_w) + AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("msm", topspeed_msm5205_address_w) // AM_RANGE(0xb400, 0xb400) // msm5205 start? doesn't seem to work right - AM_RANGE(0xb800, 0xb800) AM_DEVWRITE(SOUND, "msm", topspeed_msm5205_stop_w) + AM_RANGE(0xb800, 0xb800) AM_DEVWRITE("msm", topspeed_msm5205_stop_w) // AM_RANGE(0xc000, 0xc000) // ?? // AM_RANGE(0xc400, 0xc400) // ?? // AM_RANGE(0xc800, 0xc800) // ?? diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index 1672270bff9..382f3482705 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -237,37 +237,37 @@ static void ca2_u2_u3_w(const device_config *device, UINT8 data) static WRITE8_HANDLER( port_a_u2_w ) { - port_a_u2_u3_w(devtag_get_device(space->machine, SOUND, "sn1"), data); + port_a_u2_u3_w(devtag_get_device(space->machine, "sn1"), data); } static WRITE8_HANDLER( port_a_u3_w ) { - port_a_u2_u3_w(devtag_get_device(space->machine, SOUND, "sn2"), data); + port_a_u2_u3_w(devtag_get_device(space->machine, "sn2"), data); } static WRITE8_HANDLER( port_b_u2_w ) { - port_b_u2_u3_w(devtag_get_device(space->machine, SOUND, "sn1"), data); + port_b_u2_u3_w(devtag_get_device(space->machine, "sn1"), data); } static WRITE8_HANDLER( port_b_u3_w ) { - port_b_u2_u3_w(devtag_get_device(space->machine, SOUND, "sn2"), data); + port_b_u2_u3_w(devtag_get_device(space->machine, "sn2"), data); } static WRITE8_HANDLER( ca2_u2_w ) { - ca2_u2_u3_w(devtag_get_device(space->machine, SOUND, "sn1"), data); + ca2_u2_u3_w(devtag_get_device(space->machine, "sn1"), data); } static WRITE8_HANDLER( ca2_u3_w ) { - ca2_u2_u3_w(devtag_get_device(space->machine, SOUND, "sn2"), data); + ca2_u2_u3_w(devtag_get_device(space->machine, "sn2"), data); } diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index dd014203106..8fee46f8ac5 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -43,9 +43,9 @@ static READ8_HANDLER( tourtabl_get_databus_contents ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_READWRITE(tia_r, tia_w) AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_RAM - AM_RANGE(0x0280, 0x029f) AM_DEVREADWRITE(RIOT6532, "riot1", riot6532_r, riot6532_w) + AM_RANGE(0x0280, 0x029f) AM_DEVREADWRITE("riot1", riot6532_r, riot6532_w) AM_RANGE(0x0400, 0x047f) AM_RAM - AM_RANGE(0x0500, 0x051f) AM_DEVREADWRITE(RIOT6532, "riot2", riot6532_r, riot6532_w) + AM_RANGE(0x0500, 0x051f) AM_DEVREADWRITE("riot2", riot6532_r, riot6532_w) AM_RANGE(0x0800, 0x1fff) AM_ROM AM_RANGE(0xe800, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index cdb140bd783..c2265c46a31 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -277,7 +277,7 @@ static ADDRESS_MAP_START( writemem_mainCPU_liblrabl, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", toypop_sound_sharedram_w) /* shared RAM with sound CPU */ + AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE("namco", 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 */ AM_RANGE(0x7800, 0x7800) AM_WRITE(toypop_main_interrupt_disable_w) /* disable interrupt */ @@ -299,7 +299,7 @@ static ADDRESS_MAP_START( writemem_mainCPU_toypop, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "namco", toypop_sound_sharedram_w) /* shared RAM with sound CPU */ + AM_RANGE(0x6800, 0x6bff) AM_DEVWRITE("namco", toypop_sound_sharedram_w) /* shared RAM with sound CPU */ AM_RANGE(0x7000, 0x7000) AM_WRITE(toypop_main_interrupt_disable_w) /* disable interrupt */ AM_RANGE(0x8000, 0x8000) AM_WRITE(toypop_m68000_clear_w) /* reset 68000 */ AM_RANGE(0x8800, 0x8800) AM_WRITE(toypop_m68000_assert_w) /* reset 68000 */ @@ -322,7 +322,7 @@ static ADDRESS_MAP_START( readmem_soundCPU, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_soundCPU, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_DEVWRITE(SOUND, "namco", toypop_sound_sharedram_w) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ + AM_RANGE(0x0000, 0x03ff) AM_DEVWRITE("namco", toypop_sound_sharedram_w) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ 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) diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index cd312c07552..009ddacabf3 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -109,23 +109,23 @@ static WRITE8_HANDLER( tp84_filter_w ) C = 0; if (offset & 0x008) C += 47000; /* 47000pF = 0.047uF */ if (offset & 0x010) C += 470000; /* 470000pF = 0.47uF */ - filter_rc_set_RC(devtag_get_device(space->machine, SOUND, "filter1"),FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C)); + filter_rc_set_RC(devtag_get_device(space->machine, "filter1"),FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C)); /* 76489 #1 (optional) */ C = 0; if (offset & 0x020) C += 47000; /* 47000pF = 0.047uF */ if (offset & 0x040) C += 470000; /* 470000pF = 0.47uF */ -// filter_rc_set_RC(devtag_get_device(space->machine, SOUND, "filter2"),1000,2200,1000,C); +// filter_rc_set_RC(devtag_get_device(space->machine, "filter2"),1000,2200,1000,C); /* 76489 #2 */ C = 0; if (offset & 0x080) C += 470000; /* 470000pF = 0.47uF */ - filter_rc_set_RC(devtag_get_device(space->machine, SOUND, "filter2"),FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C)); + filter_rc_set_RC(devtag_get_device(space->machine, "filter2"),FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C)); /* 76489 #3 */ C = 0; if (offset & 0x100) C += 470000; /* 470000pF = 0.47uF */ - filter_rc_set_RC(devtag_get_device(space->machine, SOUND, "filter3"),FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C)); + filter_rc_set_RC(devtag_get_device(space->machine, "filter3"),FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C)); } static WRITE8_HANDLER( tp84_sh_irqtrigger_w ) @@ -196,9 +196,9 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_NOP) - AM_RANGE(0xc001, 0xc001) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0xc003, 0xc003) AM_DEVWRITE(SOUND, "sn2", sn76496_w) - AM_RANGE(0xc004, 0xc004) AM_DEVWRITE(SOUND, "sn3", sn76496_w) + AM_RANGE(0xc001, 0xc001) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0xc003, 0xc003) AM_DEVWRITE("sn2", sn76496_w) + AM_RANGE(0xc004, 0xc004) AM_DEVWRITE("sn3", sn76496_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index a88b0ea73e5..c589517d74a 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -259,23 +259,23 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8000) AM_READ(trackfld_sh_timer_r) 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_DEVREAD(SOUND, "vlm", trackfld_speech_r) + AM_RANGE(0xe002, 0xe002) AM_DEVREAD("vlm", trackfld_speech_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* Loads the snd command into the snd latch */ + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn", sn76496_w) /* Loads the snd command into the snd latch */ AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) /* This address triggers the SN chip to read the data port. */ - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_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(SMH_NOP) /* watch dog ? */ - AM_RANGE(0xe004, 0xe004) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) - AM_RANGE(0xe000, 0xefff) AM_DEVWRITE(SOUND, "vlm", trackfld_sound_w) /* e003 speech control */ + AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("vlm", vlm5030_data_w) + AM_RANGE(0xe000, 0xefff) AM_DEVWRITE("vlm", trackfld_sound_w) /* e003 speech control */ ADDRESS_MAP_END static ADDRESS_MAP_START( hyprolyb_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -289,9 +289,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hyprolyb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE(SOUND, "sn", sn76496_w) /* Loads the snd command into the snd latch */ + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn", sn76496_w) /* Loads the snd command into the snd latch */ AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) /* This address triggers the SN chip to read the data port. */ - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("dac", dac_w) /* There are lots more addresses which are used for setting a two bit volume controls for speech and music diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index cf4f4b56b09..7095905f606 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -38,8 +38,8 @@ void triplhnt_set_collision(running_machine *machine, int code) static void triplhnt_update_misc(running_machine *machine, int offset) { - const device_config *samples = devtag_get_device(machine, SOUND, "samples"); - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *samples = devtag_get_device(machine, "samples"); + const device_config *discrete = devtag_get_device(machine, "discrete"); UINT8 is_witch_hunt; UINT8 bit = offset >> 1; diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index f8c3e0d3b26..e8002693d93 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -35,7 +35,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7c00, 0x7fff) AM_RAM AM_BASE(&battery_ram) /* battery backed ram */ AM_RANGE(0x8000, 0x8000) AM_READ_PORT("P1") AM_WRITENOP /* controls (and irq ack?) */ AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ - AM_RANGE(0x8002, 0x8002) AM_READ_PORT("DSW") AM_DEVWRITE(SOUND, "dac", dac_w) /* dipswitches */ + AM_RANGE(0x8002, 0x8002) AM_READ_PORT("DSW") AM_DEVWRITE("dac", dac_w) /* dipswitches */ AM_RANGE(0x8003, 0x8007) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ AM_RANGE(0x8008, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index 030b9f5a50e..29e114213d3 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -93,7 +93,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4c00, 0x4fff) AM_RAM AM_RANGE(0x5000, 0x5000) AM_WRITE(irq_enable_w) AM_RANGE(0x5000, 0x503f) AM_READ_PORT("IN0") - AM_RANGE(0x5080, 0x5080) AM_DEVWRITE(SOUND, "dac", audio_dac_w) + AM_RANGE(0x5080, 0x5080) AM_DEVWRITE("dac", audio_dac_w) AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 18ae07f3d1d..b87bc7454b5 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -210,7 +210,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0") AM_RANGE(0x80, 0x80) AM_WRITE(trvmadns_banking_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index 5a93bbf8a5e..6ccfe11fff1 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -60,11 +60,11 @@ static WRITE8_DEVICE_HANDLER( trvquest_misc_w ) static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // cmos ram AM_RANGE(0x2000, 0x27ff) AM_RAM // main ram - AM_RANGE(0x3800, 0x380f) AM_DEVREADWRITE(VIA6522, "via6522_1", via_r, via_w) - AM_RANGE(0x3810, 0x381f) AM_DEVREADWRITE(VIA6522, "via6522_2", via_r, via_w) - AM_RANGE(0x3820, 0x382f) AM_DEVREADWRITE(VIA6522, "via6522_0", via_r, via_w) - AM_RANGE(0x3830, 0x3831) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x3840, 0x3841) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x3800, 0x380f) AM_DEVREADWRITE("via6522_1", via_r, via_w) + AM_RANGE(0x3810, 0x381f) AM_DEVREADWRITE("via6522_2", via_r, via_w) + AM_RANGE(0x3820, 0x382f) AM_DEVREADWRITE("via6522_0", via_r, via_w) + AM_RANGE(0x3830, 0x3831) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x3840, 0x3841) AM_DEVWRITE("ay2", ay8910_address_data_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(SMH_RAM) AM_BASE_MEMBER(gameplan_state, trvquest_question) @@ -202,7 +202,7 @@ static MACHINE_RESET( trvquest ) static INTERRUPT_GEN( trvquest_interrupt ) { - const device_config *via_2 = device_list_find_by_tag(device->machine->config->devicelist, VIA6522, "via6522_2"); + const device_config *via_2 = devtag_get_device(device->machine, "via6522_2"); via_ca1_w(via_2, 0, 1); via_ca1_w(via_2, 0, 0); } diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index 37f62ad529b..35b1072821f 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -77,7 +77,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xd000, 0xd000) AM_WRITE(tryout_sound_irq_ack_w) AM_RANGE(0xc000, 0xffff) AM_ROM diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index 4c5679b8024..88c009a72c4 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -227,7 +227,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_m660_io_map, ADDRESS_SPACE_IO, 8 ) @@ -239,7 +239,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vsgongf_audio_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END static READ8_HANDLER( sound_command1_r ) @@ -265,7 +265,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6001, 0x6001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ - AM_RANGE(0x6002, 0x6002) AM_DEVWRITE(SOUND, "dac1", dac_w) + AM_RANGE(0x6002, 0x6002) AM_DEVWRITE("dac1", dac_w) AM_RANGE(0x7f00, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -280,7 +280,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6001, 0x6001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ - AM_RANGE(0x6002, 0x6002) AM_DEVWRITE(SOUND, "dac2", dac_w) + AM_RANGE(0x6002, 0x6002) AM_DEVWRITE("dac2", dac_w) AM_RANGE(0x7f00, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -295,7 +295,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound1_m660, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ - AM_RANGE(0xc002, 0xc002) AM_DEVWRITE(SOUND, "dac1", dac_w) + AM_RANGE(0xc002, 0xc002) AM_DEVWRITE("dac1", dac_w) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -310,7 +310,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound2_m660, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ - AM_RANGE(0xc002, 0xc002) AM_DEVWRITE(SOUND, "dac2", dac_w) + AM_RANGE(0xc002, 0xc002) AM_DEVWRITE("dac2", dac_w) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -318,7 +318,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound3_m660_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound3_m660, ADDRESS_SPACE_PROGRAM, 8 ) @@ -417,7 +417,7 @@ static ADDRESS_MAP_START( writemem_sound_vsgongf, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("dac", dac_w) ADDRESS_MAP_END /*******************************************************************************/ diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c index cf314f43741..a8298e58115 100644 --- a/src/mame/drivers/tubep.c +++ b/src/mame/drivers/tubep.c @@ -259,9 +259,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tubep_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x02, 0x03) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x04, 0x05) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x04, 0x05) AM_DEVWRITE("ay3", ay8910_address_data_w) AM_RANGE(0x06, 0x06) AM_READ(tubep_soundlatch_r) AM_RANGE(0x07, 0x07) AM_WRITE(tubep_sound_unknown) ADDRESS_MAP_END @@ -613,12 +613,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rjammer_sound_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(rjammer_soundlatch_r) - AM_RANGE(0x10, 0x10) AM_DEVWRITE(SOUND, "msm", rjammer_voice_startstop_w) - AM_RANGE(0x18, 0x18) AM_DEVWRITE(SOUND, "msm", rjammer_voice_frequency_select_w) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("msm", rjammer_voice_startstop_w) + AM_RANGE(0x18, 0x18) AM_DEVWRITE("msm", rjammer_voice_frequency_select_w) AM_RANGE(0x80, 0x80) AM_WRITE(rjammer_voice_input_w) - AM_RANGE(0x90, 0x91) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0x92, 0x93) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) - AM_RANGE(0x94, 0x95) AM_DEVWRITE(SOUND, "ay3", ay8910_address_data_w) + AM_RANGE(0x90, 0x91) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0x92, 0x93) AM_DEVWRITE("ay2", ay8910_address_data_w) + AM_RANGE(0x94, 0x95) AM_DEVWRITE("ay3", ay8910_address_data_w) AM_RANGE(0x96, 0x96) AM_WRITE(rjammer_voice_intensity_control_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 1262252c428..49c1462e405 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -198,11 +198,11 @@ static MACHINE_RESET( tugboat ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_BASE(&tugboat_ram) - AM_RANGE(0x1060, 0x1061) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x1060, 0x1061) AM_DEVWRITE("ay", ay8910_address_data_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_DEVREADWRITE(PIA6821, "pia0", pia_r, pia_w) - AM_RANGE(0x11e8, 0x11eb) AM_DEVREADWRITE(PIA6821, "pia1", pia_r, pia_w) + AM_RANGE(0x11e4, 0x11e7) AM_DEVREADWRITE("pia0", pia_r, pia_w) + AM_RANGE(0x11e8, 0x11eb) AM_DEVREADWRITE("pia1", pia_r, pia_w) //AM_RANGE(0x1700, 0x1fff) AM_RAM AM_RANGE(0x18e0, 0x18ef) AM_WRITE(tugboat_score_w) AM_RANGE(0x2000, 0x2fff) AM_RAM /* tilemap RAM */ diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 8b2e6cb307d..ac1677496cb 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -474,7 +474,7 @@ static void tumbleb2_playmusic(const device_config *device) static INTERRUPT_GEN( tumbleb2_interrupt ) { cpu_set_input_line(device, 6, HOLD_LINE); - tumbleb2_playmusic(devtag_get_device(device->machine, SOUND, "oki")); + tumbleb2_playmusic(devtag_get_device(device->machine, "oki")); } static const int tumbleb_sound_lookup[256] = { @@ -667,7 +667,7 @@ static ADDRESS_MAP_START( tumblepopb_main_map, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) #endif - AM_RANGE(0x100000, 0x100001) AM_READ(tumblepb_prot_r) AM_DEVWRITE(SOUND, "oki", tumblepb_oki_w) + AM_RANGE(0x100000, 0x100001) AM_READ(tumblepb_prot_r) AM_DEVWRITE("oki", tumblepb_oki_w) AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(&tumblepb_mainram) AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ @@ -691,8 +691,8 @@ static ADDRESS_MAP_START( fncywld_main_map, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) #endif - AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x00ff) - AM_RANGE(0x100004, 0x100005) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) + AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x00ff) + AM_RANGE(0x100004, 0x100005) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprites */ AM_RANGE(0x160800, 0x16080f) AM_WRITE(SMH_RAM) /* goes slightly past the end of spriteram? */ @@ -806,8 +806,8 @@ static WRITE8_HANDLER( oki_sound_bank_w ) static ADDRESS_MAP_START( semicom_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xcfff) AM_ROM AM_RANGE(0xd000, 0xd7ff) AM_RAM - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // AM_RANGE(0xf006, 0xf006) ?? AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) AM_RANGE(0xf00e, 0xf00e) AM_WRITE(oki_sound_bank_w) @@ -816,7 +816,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( suprtrio_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xcfff) AM_ROM AM_RANGE(0xd000, 0xd7ff) AM_RAM - AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) // AM_RANGE(0xf006, 0xf006) ?? AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) AM_RANGE(0xf00e, 0xf00e) AM_WRITE(oki_sound_bank_w) @@ -841,8 +841,8 @@ static READ8_HANDLER(jumppop_z80latch_r) static ADDRESS_MAP_START( jumppop_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ym", ym3812_w) - AM_RANGE(0x02, 0x02) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym", ym3812_w) + AM_RANGE(0x02, 0x02) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x03, 0x03) AM_READ(jumppop_z80latch_r) AM_RANGE(0x04, 0x04) AM_NOP AM_RANGE(0x05, 0x05) AM_WRITE(jumppop_z80_bank_w) @@ -883,7 +883,7 @@ static ADDRESS_MAP_START( jumpkids_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(jumpkids_oki_bank_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END @@ -3284,7 +3284,7 @@ static DRIVER_INIT( tumblepb ) static DRIVER_INIT( tumbleb2 ) { - const device_config *oki = devtag_get_device(machine, SOUND, "oki"); + const device_config *oki = devtag_get_device(machine, "oki"); tumblepb_gfx1_rearrange(machine); diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 78c160eeb2a..86797ca9a26 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -132,8 +132,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */ - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK8, SMH_BANK8) diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c index b605f4cdda4..80ce900e59e 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -155,8 +155,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2400, 0x2400) AM_WRITE(SMH_NOP) /* INT ACK */ AM_RANGE(0x2800, 0x2800) AM_WRITE(tunhunt_control_w) AM_RANGE(0x2c00, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) - AM_RANGE(0x3000, 0x300f) AM_DEVREADWRITE(SOUND, "pokey1", pokey_r, pokey_w) - AM_RANGE(0x4000, 0x400f) AM_DEVREADWRITE(SOUND, "pokey2", pokey_r, pokey_w) + AM_RANGE(0x3000, 0x300f) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) + AM_RANGE(0x4000, 0x400f) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) AM_RANGE(0x5000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xfffa, 0xffff) AM_READ(SMH_ROM) AM_RANGE(0x5000, 0xffff) AM_WRITE(SMH_ROM) diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index b105d570fc9..44b64811d73 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -680,7 +680,7 @@ static READ8_HANDLER( buckrog_cpu2_command_r ) { /* assert ACK */ turbo_state *state = space->machine->driver_data; - ppi8255_set_port_c(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), 0x00); + ppi8255_set_port_c(devtag_get_device(space->machine, "ppi8255_0"), 0x00); return state->buckrog_command; } @@ -719,7 +719,7 @@ static READ8_HANDLER( buckrog_port_3_r ) static TIMER_CALLBACK( delayed_ppi8255_w ) { - ppi8255_w(devtag_get_device(machine, PPI8255, "ppi8255_0"), param >> 8, param & 0xff); + ppi8255_w(devtag_get_device(machine, "ppi8255_0"), param >> 8, param & 0xff); } @@ -747,10 +747,10 @@ static ADDRESS_MAP_START( turbo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(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_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xf900, 0xf903) AM_MIRROR(0x00fc) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) - AM_RANGE(0xfa00, 0xfa03) AM_MIRROR(0x00fc) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) - AM_RANGE(0xfb00, 0xfb03) AM_MIRROR(0x00fc) AM_DEVREADWRITE(PPI8255, "ppi8255_3", ppi8255_r, ppi8255_w) + AM_RANGE(0xf800, 0xf803) AM_MIRROR(0x00fc) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xf900, 0xf903) AM_MIRROR(0x00fc) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xfa00, 0xfa03) AM_MIRROR(0x00fc) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w) + AM_RANGE(0xfb00, 0xfb03) AM_MIRROR(0x00fc) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) AM_RANGE(0xfc00, 0xfc01) AM_MIRROR(0x00fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) AM_RANGE(0xfd00, 0xfdff) AM_READ_PORT("INPUT") AM_RANGE(0xfe00, 0xfeff) AM_READ(turbo_collision_r) @@ -775,8 +775,8 @@ static ADDRESS_MAP_START( subroc3d_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb7ff) AM_RAM // SCRATCH AM_RANGE(0xb800, 0xbfff) // HANDLE CL AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE - AM_RANGE(0xe800, 0xe803) AM_MIRROR(0x07fc) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0xf000, 0xf003) AM_MIRROR(0x07fc) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0xe800, 0xe803) AM_MIRROR(0x07fc) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0xf000, 0xf003) AM_MIRROR(0x07fc) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) ADDRESS_MAP_END @@ -792,8 +792,8 @@ 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_RAM_WRITE(turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE - AM_RANGE(0xc800, 0xc803) AM_MIRROR(0x07fc) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, buckrog_ppi8255_0_w) // 8255 - AM_RANGE(0xd000, 0xd003) AM_MIRROR(0x07fc) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) // 8255 + AM_RANGE(0xc800, 0xc803) AM_MIRROR(0x07fc) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, buckrog_ppi8255_0_w) // 8255 + AM_RANGE(0xd000, 0xd003) AM_MIRROR(0x07fc) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) // 8255 AM_RANGE(0xd800, 0xd801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) // 8279 AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE_MEMBER(turbo_state, sprite_position) // CONT RAM AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_BASE_MEMBER(turbo_state, spriteram) // CONT RAM diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 0858d23436d..78f18f668ea 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -224,7 +224,7 @@ static READ8_HANDLER( twin16_sres_r ) static WRITE8_HANDLER( twin16_sres_w ) { /* bit 1 resets the UPD7795C sound chip */ - upd7759_reset_w(devtag_get_device(space->machine, SOUND, "upd"), data & 0x02); + upd7759_reset_w(devtag_get_device(space->machine, "upd"), data & 0x02); twin16_soundlatch = data; } @@ -260,11 +260,11 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_READWRITE(twin16_sres_r, twin16_sres_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xd000, 0xd000) AM_DEVWRITE(SOUND, "upd", upd7759_port_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "upd", twin16_upd_start_w) - AM_RANGE(0xf000, 0xf000) AM_DEVREAD(SOUND, "upd", twin16_upd_busy_r) AM_WRITENOP // ??? write ??? + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("upd", upd7759_port_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("upd", twin16_upd_start_w) + AM_RANGE(0xf000, 0xf000) AM_DEVREAD("upd", twin16_upd_busy_r) AM_WRITENOP // ??? write ??? ADDRESS_MAP_END static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index ca2431182c7..9b10d3735e7 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -237,7 +237,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM") /* Twin Cobra - Coin/Start */ AM_RANGE(0x20, 0x20) AM_WRITE(twincobr_coin_w) /* Twin Cobra coin count-lockout */ AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index 49005f5cbfe..f20b7b0ea19 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -85,8 +85,8 @@ static ADDRESS_MAP_START( twins_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( twins_io, ADDRESS_SPACE_IO, 16 ) - AM_RANGE(0x0000, 0x0003) AM_DEVWRITE8(SOUND, "ay", ay8910_address_data_w, 0x00ff) - AM_RANGE(0x0002, 0x0003) AM_DEVREAD8(SOUND, "ay", ay8910_r, 0x00ff) + AM_RANGE(0x0000, 0x0003) AM_DEVWRITE8("ay", ay8910_address_data_w, 0x00ff) + AM_RANGE(0x0002, 0x0003) AM_DEVREAD8("ay", ay8910_r, 0x00ff) AM_RANGE(0x0004, 0x0005) AM_READWRITE(twins_port4_r, twins_port4_w) AM_RANGE(0x0006, 0x0007) AM_WRITE(port6_pal0_w) AM_RANGE(0x000e, 0x000f) AM_WRITE(porte_paloff0_w) @@ -248,8 +248,8 @@ static ADDRESS_MAP_START( twinsa_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0000, 0x0001) AM_READWRITE(twinsa_unk_r, porte_paloff0_w) AM_RANGE(0x0002, 0x0003) AM_WRITE(porte_paloff0_w) AM_RANGE(0x0004, 0x0005) AM_WRITE(twinsa_port4_w) // palette on this set - AM_RANGE(0x0008, 0x0009) AM_DEVWRITE8(SOUND, "ay", ay8910_address_w, 0x00ff) - AM_RANGE(0x0010, 0x0011) AM_DEVREADWRITE8(SOUND, "ay", ay8910_r, ay8910_data_w, 0x00ff) + AM_RANGE(0x0008, 0x0009) AM_DEVWRITE8("ay", ay8910_address_w, 0x00ff) + AM_RANGE(0x0010, 0x0011) AM_DEVREADWRITE8("ay", ay8910_r, ay8910_data_w, 0x00ff) AM_RANGE(0x0018, 0x0019) AM_READ(twins_port4_r) AM_WRITE(twins_port4_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index ee1170290bb..7b499e8b9b8 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -541,7 +541,7 @@ static ADDRESS_MAP_START( tx1_sound_prg, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x3000, 0x37ff) AM_RAM AM_MIRROR(0x800) AM_BASE(&z80_ram) AM_RANGE(0x4000, 0x4000) AM_WRITE(z80_intreq_w) - AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x6000, 0x6003) AM_READWRITE(tx1_pit8253_r, tx1_pit8253_w) AM_RANGE(0x7000, 0x7fff) AM_WRITE(tx1_ppi_latch_w) AM_RANGE(0xb000, 0xbfff) AM_READWRITE(ts_r, ts_w) @@ -549,7 +549,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tx1_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_data_address_w) ADDRESS_MAP_END @@ -608,7 +608,7 @@ static ADDRESS_MAP_START( buggyboy_sound_prg, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&z80_ram) AM_RANGE(0x6000, 0x6001) AM_READ(bb_analog_r) - AM_RANGE(0x6800, 0x6803) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x6800, 0x6803) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x7000, 0x7003) AM_READWRITE(tx1_pit8253_r, tx1_pit8253_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(z80_intreq_w) AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(ts_r, ts_w) @@ -627,10 +627,10 @@ ADDRESS_MAP_END /* Common */ static ADDRESS_MAP_START( buggyboy_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "ym1", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ym1", ay8910_data_address_w) - AM_RANGE(0x80, 0x80) AM_DEVREAD(SOUND, "ym2", ay8910_r) - AM_RANGE(0x80, 0x81) AM_DEVWRITE(SOUND, "ym2", ay8910_data_address_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("ym1", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym1", ay8910_data_address_w) + AM_RANGE(0x80, 0x80) AM_DEVREAD("ym2", ay8910_r) + AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ay8910_data_address_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index db92e2eed03..f02968c7a1b 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -168,7 +168,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8) AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram ) AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w ) AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w ) - AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( SOUND, "c6280", c6280_r, c6280_w ) + AM_RANGE( 0x1FE800, 0x1FEBFF) AM_DEVREADWRITE( "c6280", c6280_r, c6280_w ) AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( h6280_timer_r, h6280_timer_w ) AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w ) AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w ) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 9324e9bb22f..9e69e3e799b 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -137,8 +137,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* Sound latch read */ // AM_RANGE(0xd000, 0xd000) AM_WRITE(SMH_NOP) /* ??? */ - AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) /* M6295 */ - AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) /* YM2151 */ + AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) /* M6295 */ + AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c index d42e7c87664..3bcc586e15a 100644 --- a/src/mame/drivers/ultratnk.c +++ b/src/mame/drivers/ultratnk.c @@ -162,16 +162,16 @@ static ADDRESS_MAP_START( ultratnk_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2040, 0x2047) AM_MIRROR(0x718) AM_READ(ultratnk_collision_r) AM_RANGE(0x2060, 0x2063) AM_MIRROR(0x71c) AM_READ(ultratnk_options_r) - AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x71f) AM_DEVWRITE(SOUND, "discrete", ultratnk_attract_w) + AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x71f) AM_DEVWRITE("discrete", ultratnk_attract_w) AM_RANGE(0x2020, 0x2027) AM_MIRROR(0x718) AM_WRITE(ultratnk_collision_reset_w) AM_RANGE(0x2040, 0x2041) AM_MIRROR(0x718) AM_WRITE(ultratnk_da_latch_w) - AM_RANGE(0x2042, 0x2043) AM_MIRROR(0x718) AM_DEVWRITE(SOUND, "discrete", ultratnk_explosion_w) + AM_RANGE(0x2042, 0x2043) AM_MIRROR(0x718) AM_DEVWRITE("discrete", ultratnk_explosion_w) AM_RANGE(0x2044, 0x2045) AM_MIRROR(0x718) AM_WRITE(watchdog_reset_w) AM_RANGE(0x2066, 0x2067) AM_MIRROR(0x710) AM_WRITE(ultratnk_lockout_w) AM_RANGE(0x2068, 0x2069) AM_MIRROR(0x710) AM_WRITE(ultratnk_led_1_w) AM_RANGE(0x206a, 0x206b) AM_MIRROR(0x710) AM_WRITE(ultratnk_led_2_w) - AM_RANGE(0x206c, 0x206d) AM_MIRROR(0x710) AM_DEVWRITE(SOUND, "discrete", ultratnk_fire_2_w) - AM_RANGE(0x206e, 0x206f) AM_MIRROR(0x710) AM_DEVWRITE(SOUND, "discrete", ultratnk_fire_1_w) + AM_RANGE(0x206c, 0x206d) AM_MIRROR(0x710) AM_DEVWRITE("discrete", ultratnk_fire_2_w) + AM_RANGE(0x206e, 0x206f) AM_MIRROR(0x710) AM_DEVWRITE("discrete", ultratnk_fire_1_w) AM_RANGE(0x2800, 0x2fff) AM_NOP /* diagnostic ROM */ AM_RANGE(0x3000, 0x3fff) AM_ROM diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index 98c5cf8d586..6ecd1ab4e72 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00100000, 0x00101fff) AM_RAM AM_RANGE(0x00200000, 0x00200007) AM_WRITE(K056800_68k_w) AM_RANGE(0x00200008, 0x0020000f) AM_READ(K056800_68k_r) - AM_RANGE(0x00400000, 0x004002ff) AM_DEVREADWRITE8(SOUND, "konami", k054539_r, k054539_w, 0xffff) + AM_RANGE(0x00400000, 0x004002ff) AM_DEVREADWRITE8("konami", k054539_r, k054539_w, 0xffff) ADDRESS_MAP_END /*****************************************************************************/ diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index 9d6bf73cdd5..02e6d2c0928 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -64,8 +64,8 @@ static ADDRESS_MAP_START( readmem_burglarx, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800018, 0x800019) AM_READ_PORT("SYSTEM") AM_RANGE(0x80001a, 0x80001b) AM_READ_PORT("DSW1") AM_RANGE(0x80001c, 0x80001d) AM_READ_PORT("DSW2") - AM_RANGE(0x800188, 0x800189) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) // Sound - AM_RANGE(0x80018c, 0x80018d) AM_DEVREAD8(SOUND, "ym", ym3812_r, 0xff00 )// + AM_RANGE(0x800188, 0x800189) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0x80018c, 0x80018d) AM_DEVREAD8("ym", ym3812_r, 0xff00 )// /**/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 ) // @@ -84,9 +84,9 @@ static ADDRESS_MAP_START( writemem_burglarx, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff ) // Sound - AM_RANGE(0x80018a, 0x80018d) AM_DEVWRITE8(SOUND, "ym", ym3812_w, 0xff00 ) // - AM_RANGE(0x80018e, 0x80018f) AM_DEVWRITE(SOUND, "oki", burglarx_sound_bank_w ) // + AM_RANGE(0x800188, 0x800189) AM_DEVWRITE8("oki", okim6295_w, 0x00ff ) // Sound + AM_RANGE(0x80018a, 0x80018d) AM_DEVWRITE8("ym", ym3812_w, 0xff00 ) // + AM_RANGE(0x80018e, 0x80018f) AM_DEVWRITE("oki", burglarx_sound_bank_w ) // 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 ) // @@ -171,8 +171,8 @@ static ADDRESS_MAP_START( readmem_zeropnt, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800174, 0x800175) AM_READ(unico_gunx_0_msb_r ) // AM_RANGE(0x800178, 0x800179) AM_READ(unico_guny_1_msb_r ) // AM_RANGE(0x80017c, 0x80017d) AM_READ(unico_gunx_1_msb_r ) // - AM_RANGE(0x800188, 0x800189) AM_DEVREAD8(SOUND, "oki", okim6295_r, 0x00ff ) // Sound - AM_RANGE(0x80018c, 0x80018d) AM_DEVREAD8(SOUND, "ym", ym3812_status_port_r, 0xff00 ) // + AM_RANGE(0x800188, 0x800189) AM_DEVREAD8("oki", okim6295_r, 0x00ff ) // Sound + AM_RANGE(0x80018c, 0x80018d) AM_DEVREAD8("ym", ym3812_status_port_r, 0xff00 ) // /**/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 ) // @@ -191,9 +191,9 @@ static ADDRESS_MAP_START( writemem_zeropnt, ADDRESS_SPACE_PROGRAM, 16 ) 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_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff ) // Sound - AM_RANGE(0x80018a, 0x80018b) AM_DEVWRITE8(SOUND, "ym", ym3812_write_port_w, 0xff00 ) // - AM_RANGE(0x80018c, 0x80018d) AM_DEVWRITE8(SOUND, "ym", ym3812_control_port_w, 0xff00 ) // + AM_RANGE(0x800188, 0x800189) AM_DEVWRITE8("oki", okim6295_w, 0x00ff ) // Sound + AM_RANGE(0x80018a, 0x80018b) AM_DEVWRITE8("ym", ym3812_write_port_w, 0xff00 ) // + AM_RANGE(0x80018c, 0x80018d) AM_DEVWRITE8("ym", ym3812_control_port_w, 0xff00 ) // AM_RANGE(0x80018e, 0x80018f) AM_WRITE(zeropnt_sound_bank_w ) // 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 @@ -256,9 +256,9 @@ static WRITE32_HANDLER( zeropnt2_eeprom_w ) static ADDRESS_MAP_START( readmem_zeropnt2, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x800018, 0x80001b) AM_READ_PORT("SYSTEM") - AM_RANGE(0x800024, 0x800027) AM_DEVREAD8(SOUND, "oki1", okim6295_r, 0x00ff0000 ) // Sound - AM_RANGE(0x800028, 0x80002f) AM_DEVREAD8(SOUND, "ym", ym2151_r, 0x00ff0000 ) // - AM_RANGE(0x800030, 0x800033) AM_DEVREAD8(SOUND, "oki2", okim6295_r, 0x00ff0000 ) // + AM_RANGE(0x800024, 0x800027) AM_DEVREAD8("oki1", okim6295_r, 0x00ff0000 ) // Sound + AM_RANGE(0x800028, 0x80002f) AM_DEVREAD8("ym", ym2151_r, 0x00ff0000 ) // + AM_RANGE(0x800030, 0x800033) AM_DEVREAD8("oki2", okim6295_r, 0x00ff0000 ) // AM_RANGE(0x800140, 0x800143) AM_READ(zeropnt2_guny_0_msb_r ) // Light Guns AM_RANGE(0x800144, 0x800147) AM_READ(zeropnt2_gunx_0_msb_r ) // AM_RANGE(0x800148, 0x80014b) AM_READ(zeropnt2_guny_1_msb_r ) // @@ -277,9 +277,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_zeropnt2, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM - AM_RANGE(0x800024, 0x800027) AM_DEVWRITE8(SOUND, "oki1", okim6295_w, 0x00ff0000 ) // Sound - AM_RANGE(0x800028, 0x80002f) AM_DEVWRITE8(SOUND, "ym", ym2151_w, 0x00ff0000) // - AM_RANGE(0x800030, 0x800033) AM_DEVWRITE8(SOUND, "oki2", okim6295_w, 0x00ff0000 ) // + AM_RANGE(0x800024, 0x800027) AM_DEVWRITE8("oki1", okim6295_w, 0x00ff0000 ) // Sound + AM_RANGE(0x800028, 0x80002f) AM_DEVWRITE8("ym", ym2151_w, 0x00ff0000) // + AM_RANGE(0x800030, 0x800033) AM_DEVWRITE8("oki2", okim6295_w, 0x00ff0000 ) // 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(SMH_RAM) AM_BASE(&unico_scroll32 ) // Scroll diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index 1cdb4179e7b..df061ff130c 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -75,12 +75,12 @@ static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2010, 0x2010) AM_READ_PORT("INPUTS") AM_RANGE(0x2020, 0x2020) AM_WRITE(lamps1_w) AM_RANGE(0x2030, 0x2030) AM_WRITE(lamps2_w) - AM_RANGE(0x2040, 0x2040) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) + AM_RANGE(0x2040, 0x2040) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x2041, 0x2041) AM_READ_PORT("UNK1") - AM_RANGE(0x2041, 0x2041) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x2041, 0x2041) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x2060, 0x2060) AM_WRITE(usgames_rombank_w) AM_RANGE(0x2070, 0x2070) AM_READ_PORT("UNK2") - AM_RANGE(0x2400, 0x2401) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x2400, 0x2401) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram) AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_ROM) @@ -90,14 +90,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x2000, 0x2001) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x2400, 0x2400) AM_READ_PORT("DSW") AM_RANGE(0x2410, 0x2410) AM_READ_PORT("INPUTS") AM_RANGE(0x2420, 0x2420) AM_WRITE(lamps1_w) AM_RANGE(0x2430, 0x2430) AM_WRITE(lamps2_w) - AM_RANGE(0x2440, 0x2440) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) + AM_RANGE(0x2440, 0x2440) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x2441, 0x2441) AM_READ_PORT("UNK1") - AM_RANGE(0x2441, 0x2441) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) + AM_RANGE(0x2441, 0x2441) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0x2460, 0x2460) AM_WRITE(usgames_rombank_w) AM_RANGE(0x2470, 0x2470) AM_READ_PORT("UNK2") AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 55a6a7300c2..fc6a974eb37 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -212,9 +212,9 @@ static ADDRESS_MAP_START( common_32bit_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START( vamphalf_io, ADDRESS_SPACE_IO, 16 ) - AM_RANGE(0x0c0, 0x0c3) AM_DEVREADWRITE(SOUND, "oki", oki_r, oki_w) - AM_RANGE(0x140, 0x143) AM_DEVWRITE8(SOUND, "ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x146, 0x147) AM_DEVREADWRITE8(SOUND, "ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x0c0, 0x0c3) AM_DEVREADWRITE("oki", oki_r, oki_w) + AM_RANGE(0x140, 0x143) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x146, 0x147) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) AM_RANGE(0x1c0, 0x1c3) AM_READ(eeprom_r) AM_RANGE(0x240, 0x243) AM_WRITE(flipscreen_w) AM_RANGE(0x600, 0x603) AM_READ_PORT("SYSTEM") @@ -235,9 +235,9 @@ static ADDRESS_MAP_START( coolmini_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x300, 0x303) AM_READ_PORT("SYSTEM") AM_RANGE(0x304, 0x307) AM_READ_PORT("P1_P2") AM_RANGE(0x308, 0x30b) AM_WRITE(eeprom_w) - AM_RANGE(0x4c0, 0x4c3) AM_DEVREADWRITE(SOUND, "oki", oki_r, oki_w) - AM_RANGE(0x540, 0x543) AM_DEVWRITE8(SOUND, "ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x546, 0x547) AM_DEVREADWRITE8(SOUND, "ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x4c0, 0x4c3) AM_DEVREADWRITE("oki", oki_r, oki_w) + AM_RANGE(0x540, 0x543) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x546, 0x547) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) AM_RANGE(0x7c0, 0x7c3) AM_READ(eeprom_r) ADDRESS_MAP_END @@ -245,9 +245,9 @@ static ADDRESS_MAP_START( suplup_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x020, 0x023) AM_WRITE(eeprom_w) AM_RANGE(0x040, 0x043) AM_READ_PORT("P1_P2") AM_RANGE(0x060, 0x063) AM_READ_PORT("SYSTEM") - AM_RANGE(0x080, 0x083) AM_DEVREADWRITE(SOUND, "oki", oki_r, oki_w) - AM_RANGE(0x0c0, 0x0c3) AM_DEVWRITE8(SOUND, "ym", ym2151_register_port_w, 0x00ff) - AM_RANGE(0x0c4, 0x0c7) AM_DEVREADWRITE8(SOUND, "ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) + AM_RANGE(0x080, 0x083) AM_DEVREADWRITE("oki", oki_r, oki_w) + AM_RANGE(0x0c0, 0x0c3) AM_DEVWRITE8("ym", ym2151_register_port_w, 0x00ff) + AM_RANGE(0x0c4, 0x0c7) AM_DEVREADWRITE8("ym", ym2151_status_port_r, ym2151_data_port_w, 0x00ff) AM_RANGE(0x100, 0x103) AM_READ(eeprom_r) ADDRESS_MAP_END @@ -265,9 +265,9 @@ static ADDRESS_MAP_START( finalgdr_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x2400, 0x2403) AM_READ(finalgdr_prot_r) AM_RANGE(0x2800, 0x2803) AM_WRITE(finalgdr_backupram_bank_w) AM_RANGE(0x2c00, 0x2dff) AM_READWRITE(finalgdr_backupram_r, finalgdr_backupram_w) - AM_RANGE(0x3000, 0x3007) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x0000ff00) + AM_RANGE(0x3000, 0x3007) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x0000ff00) AM_RANGE(0x3800, 0x3803) AM_READ_PORT("P1_P2") - AM_RANGE(0x3400, 0x3403) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x0000ff00) + AM_RANGE(0x3400, 0x3403) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x0000ff00) AM_RANGE(0x3c00, 0x3c03) AM_READ_PORT("SYSTEM") AM_RANGE(0x4400, 0x4403) AM_READ(eeprom32_r) AM_RANGE(0x6000, 0x6003) AM_READNOP //? @@ -275,7 +275,7 @@ static ADDRESS_MAP_START( finalgdr_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x6040, 0x6043) AM_WRITE(finalgdr_prot_w) //AM_RANGE(0x6080, 0x6083) AM_WRITE(flipscreen32_w) //? AM_RANGE(0x6060, 0x6063) AM_WRITE(finalgdr_prize_w) - AM_RANGE(0x60a0, 0x60a3) AM_DEVWRITE(SOUND, "oki", finalgdr_oki_bank_w) + AM_RANGE(0x60a0, 0x60a3) AM_DEVWRITE("oki", finalgdr_oki_bank_w) ADDRESS_MAP_END @@ -290,10 +290,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( aoh_io, ADDRESS_SPACE_IO, 32 ) AM_RANGE(0x0480, 0x0483) AM_WRITE(eeprom32_w) - AM_RANGE(0x0620, 0x0623) AM_DEVREADWRITE8(SOUND, "oki_2", okim6295_r, okim6295_w, 0x0000ff00) - AM_RANGE(0x0660, 0x0663) AM_DEVREADWRITE8(SOUND, "oki_1", okim6295_r, okim6295_w, 0x0000ff00) - AM_RANGE(0x0640, 0x0647) AM_DEVREADWRITE8(SOUND, "ym", ym2151_r, ym2151_w, 0x0000ff00) - AM_RANGE(0x0680, 0x0683) AM_DEVWRITE(SOUND, "oki_2", aoh_oki_bank_w) + AM_RANGE(0x0620, 0x0623) AM_DEVREADWRITE8("oki_2", okim6295_r, okim6295_w, 0x0000ff00) + AM_RANGE(0x0660, 0x0663) AM_DEVREADWRITE8("oki_1", okim6295_r, okim6295_w, 0x0000ff00) + AM_RANGE(0x0640, 0x0647) AM_DEVREADWRITE8("ym", ym2151_r, ym2151_w, 0x0000ff00) + AM_RANGE(0x0680, 0x0683) AM_DEVWRITE("oki_2", aoh_oki_bank_w) ADDRESS_MAP_END /* diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index b4bce432449..7359b5773b6 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -81,10 +81,10 @@ static READ8_HANDLER( vaportra_soundlatch_r ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM - AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE(SOUND, "ym2", ym2151_r, ym2151_w) - AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE(SOUND, "oki1", okim6295_r, okim6295_w) - AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE(SOUND, "oki2", okim6295_r, okim6295_w) + AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r, ym2151_w) + AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) + AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(vaportra_soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK8,SMH_BANK8) /* ??? LOOKUP ??? */ AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index ddfdd7a4fcd..73f346e5513 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -153,8 +153,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) - AM_RANGE(0x02, 0x02) AM_DEVREAD(SOUND, "ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) + AM_RANGE(0x02, 0x02) AM_DEVREAD("ay", ay8910_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 072a73b0fe2..f2a2a4d7c2c 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -248,16 +248,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0x9800, 0x9800) AM_DEVREAD(SOUND, "oki", okim6295_r) + AM_RANGE(0x8800, 0x8801) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0x9800, 0x9800) AM_DEVREAD("oki", okim6295_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(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8800, 0x8801) AM_DEVWRITE(SOUND, "ym", ym2151_w) - AM_RANGE(0x9800, 0x9803) AM_DEVWRITE(SOUND, "oki", okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVWRITE("ym", ym2151_w) + AM_RANGE(0x9800, 0x9803) AM_DEVWRITE("oki", okim6295_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c index d230cb4ab5a..cd31f77e5a8 100644 --- a/src/mame/drivers/vcombat.c +++ b/src/mame/drivers/vcombat.c @@ -104,7 +104,7 @@ static VIDEO_UPDATE( vcombat ) { int y; const rgb_t *const pens = tlc34076_get_pens(); - const device_config *aux = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "aux"); + const device_config *aux = devtag_get_device(screen->machine, "aux"); UINT16 *m68k_buf = m68k_framebuffer[(*framebuffer_ctrl & 0x20) ? 1 : 0]; UINT16 *i860_buf = i860_framebuffer[(screen == aux) ? 1 : 0][0]; @@ -287,7 +287,7 @@ static WRITE64_HANDLER( v1_fb_w ) static WRITE16_HANDLER( crtc_w ) { - const device_config *crtc = device_list_find_by_tag(space->machine->config->devicelist, MC6845, "crtc"); + const device_config *crtc = devtag_get_device(space->machine, "crtc"); if (crtc == NULL) return; @@ -366,7 +366,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x08ffff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0001) AM_DEVWRITE(SOUND, "dac", vcombat_dac_w) + AM_RANGE(0x0c0000, 0x0c0001) AM_DEVWRITE("dac", vcombat_dac_w) AM_RANGE(0x140000, 0x140001) AM_READ(sound_resetmain_r) /* Ping M0's reset line */ AM_RANGE(0x180000, 0x180001) AM_RAM AM_SHARE(4) /* M1<-M0 */ AM_RANGE(0x1c0000, 0x1c0001) AM_RAM AM_SHARE(5) /* M1->M0 */ diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index 0601bd3b029..1cef6f9946e 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -84,7 +84,7 @@ static READ32_HANDLER( vegaeo_custom_read ) static ADDRESS_MAP_START( vega_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_RANGE(0x80000000, 0x80013fff) AM_READWRITE(vega_vram_r, vega_vram_w) - AM_RANGE(0xfc000000, 0xfc0000ff) AM_DEVREADWRITE8(AT28C16, "at28c16", at28c16_r, at28c16_w, 0x000000ff) + AM_RANGE(0xfc000000, 0xfc0000ff) AM_DEVREADWRITE8("at28c16", at28c16_r, at28c16_w, 0x000000ff) AM_RANGE(0xfc200000, 0xfc2003ff) AM_RAM_WRITE(vega_palette_w) AM_BASE(&paletteram32) AM_RANGE(0xfc400000, 0xfc40005b) AM_WRITENOP // crt registers ? AM_RANGE(0xfc600000, 0xfc600003) AM_WRITENOP // soundlatch diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index dec3356e7d3..727d65e8e16 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -528,7 +528,7 @@ static VIDEO_UPDATE( vegas ) static MACHINE_START( vegas ) { - voodoo_device = device_list_find_by_tag(machine->config->devicelist, VOODOO_GRAPHICS, "voodoo"); + voodoo_device = devtag_get_device(machine, "voodoo"); /* allocate timers for the NILE */ timer[0] = timer_alloc(machine, NULL, NULL); @@ -776,7 +776,7 @@ static WRITE32_HANDLER( pci_ide_w ) case 0x14: /* interrupt pending */ if (data & 4) - ide_interrupt(device_list_find_by_tag(space->machine->config->devicelist, IDE_CONTROLLER, "ide"), 0); + ide_interrupt(devtag_get_device(space->machine, "ide"), 0); break; } if (LOG_PCI) @@ -1560,8 +1560,8 @@ INLINE void _add_dynamic_device_address(const device_config *device, offs_t star static void remap_dynamic_addresses(running_machine *machine) { - const device_config *ethernet = device_list_find_by_tag(machine->config->devicelist, SMC91C94, "ethernet"); - const device_config *ide = device_list_find_by_tag(machine->config->devicelist, IDE_CONTROLLER, "ide"); + const device_config *ethernet = devtag_get_device(machine, "ethernet"); + const device_config *ide = devtag_get_device(machine, "ide"); int voodoo_type = voodoo_get_type(voodoo_device); offs_t base; int addr; diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 0305a8809f6..810d35ccd26 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -277,7 +277,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fd0, 0x5fd0) AM_READ(vendetta_eeprom_r) /* vblank, service */ AM_RANGE(0x5fd1, 0x5fd1) AM_READ_PORT("SERVICE") AM_RANGE(0x5fe4, 0x5fe4) AM_READ(vendetta_sound_interrupt_r) - AM_RANGE(0x5fe6, 0x5fe7) AM_DEVREAD(SOUND, "konami", vendetta_sound_r) + AM_RANGE(0x5fe6, 0x5fe7) AM_DEVREAD("konami", vendetta_sound_r) 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? */ @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fe0, 0x5fe0) AM_WRITE(vendetta_5fe0_w) AM_RANGE(0x5fe2, 0x5fe2) AM_WRITE(vendetta_eeprom_w) AM_RANGE(0x5fe4, 0x5fe4) AM_WRITE(z80_irq_w) - AM_RANGE(0x5fe6, 0x5fe7) AM_DEVWRITE(SOUND, "konami", k053260_w) + AM_RANGE(0x5fe6, 0x5fe7) AM_DEVWRITE("konami", k053260_w) /* what is the desired effect of overlapping these memory regions anyway? */ AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_BANK3) AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_BANK2) @@ -313,7 +313,7 @@ static ADDRESS_MAP_START( esckids_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3f92, 0x3f92) AM_READ(vendetta_eeprom_r) // vblank, TEST SW on PCB AM_RANGE(0x3f93, 0x3f93) AM_READ_PORT("SERVICE") AM_RANGE(0x3fd4, 0x3fd4) AM_READ(vendetta_sound_interrupt_r) // Sound - AM_RANGE(0x3fd6, 0x3fd7) AM_DEVREAD(SOUND, "konami", vendetta_sound_r) // Sound + AM_RANGE(0x3fd6, 0x3fd7) AM_DEVREAD("konami", 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(SMH_BANK3) // 052109 (Tilemap) 0x0000-0x0fff @@ -331,7 +331,7 @@ static ADDRESS_MAP_START( esckids_writemem, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVWRITE(SOUND, "konami", k053260_w) // Sound + AM_RANGE(0x3fd6, 0x3fd7) AM_DEVWRITE("konami", k053260_w) // Sound 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(SMH_BANK3) // 052109 (Tilemap) 0x0000-0x0fff @@ -345,16 +345,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) - AM_RANGE(0xf800, 0xf801) AM_DEVREAD(SOUND, "ym", ym2151_r) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVREAD(SOUND, "konami", k053260_r) + AM_RANGE(0xf800, 0xf801) AM_DEVREAD("ym", ym2151_r) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVREAD("konami", k053260_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0xf800, 0xf801) AM_DEVWRITE(SOUND, "ym", ym2151_w) + AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("ym", ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w) - AM_RANGE(0xfc00, 0xfc2f) AM_DEVWRITE(SOUND, "konami", k053260_w) + AM_RANGE(0xfc00, 0xfc2f) AM_DEVWRITE("konami", k053260_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c index fa017c8a668..721a329b0a5 100644 --- a/src/mame/drivers/vertigo.c +++ b/src/mame/drivers/vertigo.c @@ -40,7 +40,7 @@ static ADDRESS_MAP_START( vertigo_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x004050, 0x00405f) AM_RAM_WRITE(vertigo_audio_w) AM_MIRROR(0x001000) AM_RANGE(0x004060, 0x00406f) AM_WRITE(vertigo_motor_w) AM_MIRROR(0x001000) AM_RANGE(0x004070, 0x00407f) AM_WRITE(vertigo_wsot_w) AM_MIRROR(0x001000) - AM_RANGE(0x006000, 0x006007) AM_DEVREADWRITE(PIT8254, "pit8254", vertigo_pit8254_lsb_r, vertigo_pit8254_lsb_w) + AM_RANGE(0x006000, 0x006007) AM_DEVREADWRITE("pit8254", vertigo_pit8254_lsb_r, vertigo_pit8254_lsb_w) AM_RANGE(0x007000, 0x0073ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x800000, 0x81ffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c index 6a5eb5a3971..53b656d4eda 100644 --- a/src/mame/drivers/videopin.c +++ b/src/mame/drivers/videopin.c @@ -66,7 +66,7 @@ static TIMER_CALLBACK( interrupt_callback ) static MACHINE_RESET( videopin ) { - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); timer_set(machine, video_screen_get_time_until_pos(machine->primary_screen, 32, 0), NULL, 32, interrupt_callback); @@ -197,12 +197,12 @@ static WRITE8_DEVICE_HANDLER( videopin_note_dvsr_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x0200, 0x07ff) AM_RAM_WRITE(videopin_video_ram_w) AM_BASE(&videopin_video_ram) - AM_RANGE(0x0800, 0x0800) AM_READ(videopin_misc_r) AM_DEVWRITE(SOUND, "discrete", videopin_note_dvsr_w) + AM_RANGE(0x0800, 0x0800) AM_READ(videopin_misc_r) AM_DEVWRITE("discrete", videopin_note_dvsr_w) AM_RANGE(0x0801, 0x0801) AM_WRITE(videopin_led_w) AM_RANGE(0x0802, 0x0802) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0804, 0x0804) AM_WRITE(videopin_ball_w) - AM_RANGE(0x0805, 0x0805) AM_DEVWRITE(SOUND, "discrete", videopin_out1_w) - AM_RANGE(0x0806, 0x0806) AM_DEVWRITE(SOUND, "discrete", videopin_out2_w) + AM_RANGE(0x0805, 0x0805) AM_DEVWRITE("discrete", videopin_out1_w) + AM_RANGE(0x0806, 0x0806) AM_DEVWRITE("discrete", videopin_out2_w) AM_RANGE(0x1000, 0x1000) AM_READ_PORT("IN0") AM_RANGE(0x1800, 0x1800) AM_READ_PORT("DSW") AM_RANGE(0x2000, 0x3fff) AM_ROM diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index eefb693ee53..fa211c59952 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -891,7 +891,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_sound_port, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00 , 0xff ) AM_READWRITE(sound_io_r, sound_io_w) - AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE(SOUND, "dac", dac_w) + AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w) AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(sound_p2_r, sound_p2_w) ADDRESS_MAP_END @@ -905,8 +905,8 @@ static ADDRESS_MAP_START( i8051_sound_port, ADDRESS_SPACE_IO, 8 ) /* ports */ AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READWRITE(baby_sound_p0_r, baby_sound_p0_w) AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(baby_sound_p1_r, baby_sound_p1_w) - AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READ(baby_sound_p2_r) AM_DEVWRITE(SOUND, "dac", baby_sound_p2_w) - AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_DEVREADWRITE(SOUND, "ay", baby_sound_p3_r, baby_sound_p3_w) + AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READ(baby_sound_p2_r) AM_DEVWRITE("dac", baby_sound_p2_w) + AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_DEVREADWRITE("ay", baby_sound_p3_r, baby_sound_p3_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index e60f569296e..a57300e93ea 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -120,20 +120,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0x80, 0x81) AM_READWRITE(soundlatch_r, vigilant_sample_addr_w) /* STL / STH */ - AM_RANGE(0x82, 0x82) AM_DEVWRITE(SOUND, "dac", m72_sample_w) /* COUNT UP */ + AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) /* COUNT UP */ AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w) /* IRQ clear */ AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) /* S ROM C */ ADDRESS_MAP_END static ADDRESS_MAP_START( buccanrs_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x02, 0x03) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r) /* SDRE */ AM_RANGE(0x80, 0x81) AM_WRITE(vigilant_sample_addr_w) /* STL / STH */ - AM_RANGE(0x82, 0x82) AM_DEVWRITE(SOUND, "dac", m72_sample_w) /* COUNT UP */ + AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w) /* COUNT UP */ AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w) /* IRQ clear */ AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) /* S ROM C */ ADDRESS_MAP_END diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index 06a8d04c9ae..f01c2321bc3 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -39,7 +39,7 @@ static VIDEO_UPDATE(viper) { - const device_config *device = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo"); + const device_config *device = devtag_get_device(screen->machine, "voodoo"); return voodoo_update(device, bitmap, cliprect) ? 0 : UPDATE_HAS_NOT_CHANGED; } @@ -552,14 +552,14 @@ static WRITE64_HANDLER(voodoo3_lfb_w) static ADDRESS_MAP_START(viper_map, ADDRESS_SPACE_PROGRAM, 64) AM_RANGE(0x00000000, 0x00ffffff) AM_MIRROR(0x1000000) AM_RAM AM_RANGE(0x80000000, 0x800fffff) AM_READWRITE(epic_64be_r, epic_64be_w) - AM_RANGE(0x82000000, 0x83ffffff) AM_DEVREADWRITE32(VOODOO_GRAPHICS, "voodoo", banshee_r, banshee_w, U64(0xffffffffffffffff)) - AM_RANGE(0x84000000, 0x85ffffff) AM_DEVREADWRITE32(VOODOO_GRAPHICS, "voodoo", banshee_fb_r, banshee_fb_w, U64(0xffffffffffffffff)) - AM_RANGE(0xfe800000, 0xfe8000ff) AM_DEVREADWRITE32(VOODOO_GRAPHICS, "voodoo", banshee_io_r, banshee_io_w, U64(0xffffffffffffffff)) - AM_RANGE(0xfec00000, 0xfedfffff) AM_DEVREADWRITE(PCI_BUS, "pcibus", pci_config_addr_r, pci_config_addr_w) - AM_RANGE(0xfee00000, 0xfeefffff) AM_DEVREADWRITE(PCI_BUS, "pcibus", pci_config_data_r, pci_config_data_w) - AM_RANGE(0xff300000, 0xff300fff) AM_DEVREADWRITE(IDE_CONTROLLER, "ide", ata_r, ata_w) + AM_RANGE(0x82000000, 0x83ffffff) AM_DEVREADWRITE32("voodoo", banshee_r, banshee_w, U64(0xffffffffffffffff)) + AM_RANGE(0x84000000, 0x85ffffff) AM_DEVREADWRITE32("voodoo", banshee_fb_r, banshee_fb_w, U64(0xffffffffffffffff)) + AM_RANGE(0xfe800000, 0xfe8000ff) AM_DEVREADWRITE32("voodoo", banshee_io_r, banshee_io_w, U64(0xffffffffffffffff)) + AM_RANGE(0xfec00000, 0xfedfffff) AM_DEVREADWRITE("pcibus", pci_config_addr_r, pci_config_addr_w) + AM_RANGE(0xfee00000, 0xfeefffff) AM_DEVREADWRITE("pcibus", pci_config_data_r, pci_config_data_w) + AM_RANGE(0xff300000, 0xff300fff) AM_DEVREADWRITE("ide", ata_r, ata_w) AM_RANGE(0xffe10000, 0xffe10007) AM_READ(unk1_r) - AM_RANGE(0xffe30000, 0xffe31fff) AM_DEVREADWRITE8(M48T58,"m48t58",timekeeper_r, timekeeper_w, U64(0xffffffffffffffff)) + AM_RANGE(0xffe30000, 0xffe31fff) AM_DEVREADWRITE8("m48t58",timekeeper_r, timekeeper_w, U64(0xffffffffffffffff)) AM_RANGE(0xffe40000, 0xffe4000f) AM_NOP AM_RANGE(0xffe50000, 0xffe50007) AM_WRITE(unk2_w) AM_RANGE(0xffe80000, 0xffe80007) AM_WRITE(unk1a_w) @@ -587,7 +587,7 @@ static void ide_interrupt(const device_config *device, int state) static MACHINE_RESET(viper) { - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } static MACHINE_DRIVER_START(viper) @@ -601,8 +601,8 @@ static MACHINE_DRIVER_START(viper) MDRV_MACHINE_RESET(viper) MDRV_PCI_BUS_ADD("pcibus", 0) - MDRV_PCI_BUS_DEVICE(0, NULL, NULL, mpc8240_pci_r, mpc8240_pci_w) - MDRV_PCI_BUS_DEVICE(12, VOODOO_GRAPHICS, "voodoo", voodoo3_pci_r, voodoo3_pci_w) + MDRV_PCI_BUS_DEVICE(0, NULL, mpc8240_pci_r, mpc8240_pci_w) + MDRV_PCI_BUS_DEVICE(12, "voodoo", voodoo3_pci_r, voodoo3_pci_w) MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt) MDRV_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen") @@ -633,7 +633,7 @@ static DRIVER_INIT(viper) static DRIVER_INIT(vipercf) { - const device_config *ide = devtag_get_device(machine, IDE_CONTROLLER, "ide"); + const device_config *ide = devtag_get_device(machine, "ide"); DRIVER_INIT_CALL(viper); diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 21bd76f9636..8811287ea51 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -228,7 +228,7 @@ static ADDRESS_MAP_START( varia_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x178800, 0x1796ff) AM_RAM AM_BASE(&vmetal_videoregs) AM_RANGE(0x179700, 0x179713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers - AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1_P2") AM_DEVWRITE8(SOUND, "es", vmetal_control_w, 0x00ff) + AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1_P2") AM_DEVWRITE8("es", vmetal_control_w, 0x00ff) AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM") /* i have no idea whats meant to be going on here .. it seems to read one bit of the dips from some of them, protection ??? */ @@ -250,9 +250,9 @@ static ADDRESS_MAP_START( varia_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x31fffc, 0x31fffd) AM_READ(varia_dips_bit1_r ) // 0x40 = dip1-1 , 0x80 = dip2-1 AM_RANGE(0x31fffe, 0x31ffff) AM_READ(varia_random ) // nothing? - AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) - AM_RANGE(0x400002, 0x400003) AM_DEVWRITE8(SOUND, "oki", okim6295_w, 0x00ff) // Volume/channel info - AM_RANGE(0x500000, 0x50000d) AM_DEVWRITE8(SOUND, "es", vmetal_es8712_w, 0x00ff) + AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff ) + AM_RANGE(0x400002, 0x400003) AM_DEVWRITE8("oki", okim6295_w, 0x00ff) // Volume/channel info + AM_RANGE(0x500000, 0x50000d) AM_DEVWRITE8("es", vmetal_es8712_w, 0x00ff) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index c6756dad021..2a7da610057 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -91,7 +91,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8800) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0x8801, 0x8801) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) - AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(SMH_NOP) /* ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 11e0daf006f..c121d0068f1 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -114,10 +114,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vroulet_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_data_address_w) - AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) - AM_RANGE(0x80, 0x83) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) + AM_RANGE(0x00, 0x00) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_data_address_w) + AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) + AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c index b2e014d5022..12c70a2c471 100644 --- a/src/mame/drivers/vsnes.c +++ b/src/mame/drivers/vsnes.c @@ -204,12 +204,12 @@ static WRITE8_DEVICE_HANDLER( psg_4017_w ) static ADDRESS_MAP_START( vsnes_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&work_ram) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w) - AM_RANGE(0x4011, 0x4011) AM_DEVWRITE(SOUND, "dac1", dac_w) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE(SOUND, "nes1", nes_psg_r, nes_psg_w) + AM_RANGE(0x4011, 0x4011) AM_DEVWRITE("dac1", dac_w) + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes1", nes_psg_r, nes_psg_w) AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_0_w) - AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE(SOUND, "nes1", psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE("nes1", psg_4015_r, psg_4015_w) /* PSG status / first control register */ AM_RANGE(0x4016, 0x4016) AM_READWRITE(vsnes_in0_r, vsnes_in0_w) - AM_RANGE(0x4017, 0x4017) AM_READ(vsnes_in1_r) AM_DEVWRITE(SOUND, "nes1", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4017, 0x4017) AM_READ(vsnes_in1_r) AM_DEVWRITE("nes1", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x4020, 0x4020) AM_READWRITE(vsnes_coin_counter_r, vsnes_coin_counter_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -217,12 +217,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vsnes_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&work_ram_1) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_1_r, ppu2c0x_1_w) - AM_RANGE(0x4011, 0x4011) AM_DEVWRITE(SOUND, "dac2", dac_w) - AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE(SOUND, "nes2", nes_psg_r, nes_psg_w) + AM_RANGE(0x4011, 0x4011) AM_DEVWRITE("dac2", dac_w) + AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes2", nes_psg_r, nes_psg_w) AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_1_w) - AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE(SOUND, "nes2", psg_4015_r, psg_4015_w) /* PSG status / first control register */ + AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE("nes2", psg_4015_r, psg_4015_w) /* PSG status / first control register */ AM_RANGE(0x4016, 0x4016) AM_READWRITE(vsnes_in0_1_r, vsnes_in0_1_w) - AM_RANGE(0x4017, 0x4017) AM_READ(vsnes_in1_1_r) AM_DEVWRITE(SOUND, "nes2", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ + AM_RANGE(0x4017, 0x4017) AM_READ(vsnes_in1_1_r) AM_DEVWRITE("nes2", psg_4017_w) /* IN1 - input port 2 / PSG second control register */ AM_RANGE(0x4020, 0x4020) AM_WRITE(vsnes_coin_counter_1_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c index 2a93b4fced4..9c6d187c8a0 100644 --- a/src/mame/drivers/vulgus.c +++ b/src/mame/drivers/vulgus.c @@ -91,8 +91,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0x8001) AM_DEVWRITE(SOUND, "ay1", ay8910_address_data_w) - AM_RANGE(0xc000, 0xc001) AM_DEVWRITE(SOUND, "ay2", ay8910_address_data_w) + AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w) + AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ay2", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 3208d74581e..d6f2274bffb 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -155,8 +155,8 @@ static ADDRESS_MAP_START( wallc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb000) AM_WRITENOP AM_RANGE(0xb100, 0xb100) AM_WRITE(wallc_coin_counter_w) AM_RANGE(0xb200, 0xb200) AM_WRITENOP - AM_RANGE(0xb500, 0xb500) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) - AM_RANGE(0xb600, 0xb600) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) + AM_RANGE(0xb500, 0xb500) AM_DEVWRITE("ay", ay8910_address_w) + AM_RANGE(0xb600, 0xb600) AM_DEVWRITE("ay", ay8910_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index 3916d434e57..4efe2debc79 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -235,7 +235,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w) + AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index e8827a6a187..8f65184f14e 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -205,7 +205,7 @@ static WRITE8_HANDLER( warriorb_pancontrol ) // popmessage(" pan %02x %02x %02x %02x", ninjaw_pandata[0], ninjaw_pandata[1], ninjaw_pandata[2], ninjaw_pandata[3] ); - flt_volume_set_volume(devtag_get_device(space->machine, SOUND, fltname[offset & 3]), ninjaw_pandata[offset] / 100.0); + flt_volume_set_volume(devtag_get_device(space->machine, fltname[offset & 3]), ninjaw_pandata[offset] / 100.0); } @@ -251,7 +251,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK10, SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_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(warriorb_pancontrol) /* pan */ diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index 17a68510639..d9be92a7a68 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -144,7 +144,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE(SOUND, "ym", ym2608_r, ym2608_w) + AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE("ym", ym2608_r, ym2608_w) AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* ??? adpcm ??? */ AM_RANGE(0xfc10, 0xfc10) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 788b680d135..bb8144235e4 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -197,9 +197,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "msm", adpcm_control_w) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w) - AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE(SOUND, "ym", ym2203_r, ym2203_w) + AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index 87a79f70f19..50969a21b63 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -700,9 +700,9 @@ static ADDRESS_MAP_START( wecleman_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9001) AM_WRITE(multiply_w) // Protection AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_NOP) // ? AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) // From main CPU - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE(SOUND, "konami", k007232_r, k007232_w) // K007232 (Reading offset 5/b triggers the sample) - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE(SOUND, "konami", wecleman_K00723216_bank_w) // Samples banking + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("konami", k007232_r, k007232_w) // K007232 (Reading offset 5/b triggers the sample) + AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("konami", wecleman_K00723216_bank_w) // Samples banking ADDRESS_MAP_END @@ -726,9 +726,9 @@ static WRITE8_HANDLER( hotchase_sound_control_w ) int reg[8]; - sound[0] = devtag_get_device(space->machine, SOUND, "konami1"); - sound[1] = devtag_get_device(space->machine, SOUND, "konami2"); - sound[2] = devtag_get_device(space->machine, SOUND, "konami3"); + sound[0] = devtag_get_device(space->machine, "konami1"); + sound[1] = devtag_get_device(space->machine, "konami2"); + sound[2] = devtag_get_device(space->machine, "konami3"); reg[offset] = data; @@ -787,9 +787,9 @@ static WRITE8_DEVICE_HANDLER( hotchase_k007232_w ) static ADDRESS_MAP_START( hotchase_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x100d) AM_DEVREADWRITE(SOUND, "konami1", hotchase_k007232_r, hotchase_k007232_w) // 3 x K007232 - AM_RANGE(0x2000, 0x200d) AM_DEVREADWRITE(SOUND, "konami2", hotchase_k007232_r, hotchase_k007232_w) - AM_RANGE(0x3000, 0x300d) AM_DEVREADWRITE(SOUND, "konami3", hotchase_k007232_r, hotchase_k007232_w) + AM_RANGE(0x1000, 0x100d) AM_DEVREADWRITE("konami1", hotchase_k007232_r, hotchase_k007232_w) // 3 x K007232 + AM_RANGE(0x2000, 0x200d) AM_DEVREADWRITE("konami2", hotchase_k007232_r, hotchase_k007232_w) + AM_RANGE(0x3000, 0x300d) AM_DEVREADWRITE("konami3", hotchase_k007232_r, hotchase_k007232_w) AM_RANGE(0x4000, 0x4007) AM_WRITE(hotchase_sound_control_w) // Sound volume, banking, etc. AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_NOP) // ? (written with 0 on IRQ, 1 on FIRQ) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) // From main CPU (Read on IRQ) @@ -1076,7 +1076,7 @@ static INTERRUPT_GEN( wecleman_interrupt ) static MACHINE_RESET( wecleman ) { - k007232_set_bank( devtag_get_device(machine, SOUND, "konami"), 0, 1 ); + k007232_set_bank( devtag_get_device(machine, "konami"), 0, 1 ); } static MACHINE_DRIVER_START( wecleman ) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 0b08577f57a..c4a61c6b2df 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -397,7 +397,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(welltris_sh_bankswitch_w) - AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ym", ym2610_r, ym2610_w) AM_RANGE(0x10, 0x10) AM_READ(soundlatch_r) AM_RANGE(0x18, 0x18) AM_WRITE(pending_command_clear_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 4b752dbda10..9672ea90aca 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -691,7 +691,7 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_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(SMH_NOP) /* pan */ diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index 94f75fdc6d7..c0ce2720238 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -523,8 +523,8 @@ ADDRESS_MAP_END void defender_install_io_space(const address_space *space) { - const device_config *pia_0 = devtag_get_device(space->machine, PIA6821, "pia_0"); - const device_config *pia_1 = devtag_get_device(space->machine, PIA6821, "pia_1"); + const device_config *pia_0 = devtag_get_device(space->machine, "pia_0"); + const device_config *pia_1 = devtag_get_device(space->machine, "pia_1"); /* this routine dynamically installs the memory mapped above from c000-cfff */ memory_install_write8_handler (space, 0xc000, 0xc00f, 0, 0x03e0, SMH_BANK4); @@ -550,8 +550,8 @@ static ADDRESS_MAP_START( williams_map, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_RAM) AM_BASE(&paletteram) - AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE(PIA6821, "pia_0", pia_r, pia_w) - AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE(PIA6821, "pia_1", pia_r, pia_w) + AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia_r, pia_w) + AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_1", pia_r, pia_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) @@ -565,8 +565,8 @@ static ADDRESS_MAP_START( williams_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_RAM) AM_BASE(&paletteram) - AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE(PIA6821, "pia_0", pia_r, pia_w) - AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE(PIA6821, "pia_1", pia_r, pia_w) + AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia_r, pia_w) + AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_1", pia_r, pia_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) @@ -591,8 +591,8 @@ static ADDRESS_MAP_START( blaster_map, ADDRESS_SPACE_PROGRAM, 8 ) 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(SMH_RAM) AM_BASE(&paletteram) - AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE(PIA6821, "pia_0", pia_r, pia_w) - AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE(PIA6821, "pia_1", pia_r, pia_w) + AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia_r, pia_w) + AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_1", pia_r, pia_w) AM_RANGE(0xc900, 0xc93f) AM_WRITE(blaster_vram_select_w) AM_RANGE(0xc940, 0xc97f) AM_WRITE(blaster_remap_select_w) AM_RANGE(0xc980, 0xc9bf) AM_WRITE(blaster_bank_select_w) @@ -619,8 +619,8 @@ static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0xc980, 0xc983) AM_MIRROR(0x0070) AM_DEVREADWRITE(PIA6821, "pia_1", pia_r, pia_w) - AM_RANGE(0xc984, 0xc987) AM_MIRROR(0x0070) AM_DEVREADWRITE(PIA6821, "pia_0", pia_r, pia_w) + AM_RANGE(0xc980, 0xc983) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_1", pia_r, pia_w) + AM_RANGE(0xc984, 0xc987) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_0", pia_r, pia_w) AM_RANGE(0xc98c, 0xc98f) AM_MIRROR(0x0070) AM_WRITE(williams2_7segment_w) AM_RANGE(0xcb00, 0xcb1f) AM_WRITE(williams2_fg_select_w) AM_RANGE(0xcb20, 0xcb3f) AM_WRITE(williams2_bg_select_w) @@ -641,8 +641,8 @@ static ADDRESS_MAP_START( williams2_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) - AM_RANGE(0xc980, 0xc983) AM_MIRROR(0x0070) AM_DEVREADWRITE(PIA6821, "pia_1", pia_r, pia_w) - AM_RANGE(0xc984, 0xc987) AM_MIRROR(0x0070) AM_DEVREADWRITE(PIA6821, "pia_0", pia_r, pia_w) + AM_RANGE(0xc980, 0xc983) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_1", pia_r, pia_w) + AM_RANGE(0xc984, 0xc987) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_0", pia_r, pia_w) AM_RANGE(0xc98c, 0xc98f) AM_MIRROR(0x0070) AM_WRITE(williams2_7segment_w) AM_RANGE(0xcb00, 0xcb1f) AM_WRITE(williams2_fg_select_w) AM_RANGE(0xcb20, 0xcb3f) AM_WRITE(williams2_bg_select_w) @@ -666,7 +666,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( defender_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ - AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE(PIA6821, "pia_2", pia_r, pia_w) + AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia_2", pia_r, pia_w) AM_RANGE(0xb000, 0xffff) AM_ROM /* most games start at $F000, Sinistar starts at $B000 */ ADDRESS_MAP_END @@ -674,7 +674,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ AM_RANGE(0x0080, 0x00ff) AM_RAM /* MC6810 RAM */ - AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE(PIA6821, "pia_2", pia_r, pia_w) + AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia_2", pia_r, pia_w) AM_RANGE(0xb000, 0xffff) AM_ROM /* most games start at $F000, Sinistar starts at $B000 */ ADDRESS_MAP_END @@ -689,7 +689,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( williams2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */ AM_RANGE(0x0080, 0x00ff) AM_RAM /* MC6810 RAM */ - AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(PIA6821, "pia_2", pia_r, pia_w) + AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("pia_2", pia_r, pia_w) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -2794,7 +2794,7 @@ static DRIVER_INIT( blastkit ) static DRIVER_INIT( spdball ) { - const device_config *pia_3 = devtag_get_device(machine, PIA6821, "pia_3"); + const device_config *pia_3 = devtag_get_device(machine, "pia_3"); CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000); diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index b67621d0c81..1cdb921bc27 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -133,8 +133,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wink_sound_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(SOUND, "ay", ay8910_r, ay8910_data_w) - AM_RANGE(0x80, 0x80) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) + AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w) + AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w) ADDRESS_MAP_END static INPUT_PORTS_START( wink ) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 01fdf36df06..6d21c9f33be 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -440,8 +440,8 @@ static const ym2203_interface ym2203_interface_1 = static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, UNBANKED_SIZE-1) AM_ROM AM_RANGE(UNBANKED_SIZE, 0x7fff) AM_READ(SMH_BANK1) - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa00f) AM_READWRITE(read_a00x, write_a00x) AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(gfx0_vram_r, gfx0_vram_w) AM_BASE(&gfx0_vram) AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(gfx0_cram_r, gfx0_cram_w) AM_BASE(&gfx0_cram) @@ -458,9 +458,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( map_sub, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) - AM_RANGE(0x8010, 0x8016) AM_DEVREADWRITE(SOUND, "es", read_8010, es8712_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) + AM_RANGE(0x8010, 0x8016) AM_DEVREADWRITE("es", read_8010, es8712_w) AM_RANGE(0xa000, 0xa00f) AM_READWRITE(read_a00x, write_a00x) AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE(1) AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE(2) diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index f88396b1418..4f3f08bbaa1 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -189,7 +189,7 @@ static int dsc0, dsc1; static WRITE8_HANDLER( sound_command_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); switch (offset) { @@ -263,9 +263,9 @@ 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) /* Stinger/Scion */ - AM_RANGE(0x4000, 0x4001) AM_DEVWRITE(SOUND, "8910.3", ay8910_address_data_w) - AM_RANGE(0x5000, 0x5001) AM_DEVWRITE(SOUND, "8910.1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "8910.2", ay8910_address_data_w) /* Wiz only */ + AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("8910.3", ay8910_address_data_w) + AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("8910.1", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("8910.2", ay8910_address_data_w) /* Wiz only */ AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,interrupt_enable_w) /* Wiz */ ADDRESS_MAP_END @@ -273,8 +273,8 @@ static ADDRESS_MAP_START( stinger_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) /* Stinger/Scion */ - AM_RANGE(0x5000, 0x5001) AM_DEVWRITE(SOUND, "8910.1", ay8910_address_data_w) - AM_RANGE(0x6000, 0x6001) AM_DEVWRITE(SOUND, "8910.2", ay8910_address_data_w) /* Wiz only */ + AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("8910.1", ay8910_address_data_w) + AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("8910.2", ay8910_address_data_w) /* Wiz only */ AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,interrupt_enable_w) /* Wiz */ ADDRESS_MAP_END diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c index 18fd8c39de5..549fc54f2c9 100644 --- a/src/mame/drivers/wldarrow.c +++ b/src/mame/drivers/wldarrow.c @@ -166,13 +166,13 @@ static ADDRESS_MAP_START( wldarrow_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x7fff) AM_RAM AM_BASE(&wldarrow_videoram_1) AM_RANGE(0x8000, 0x9fff) AM_RAM AM_BASE(&wldarrow_videoram_2) AM_RANGE(0xcd00, 0xcdff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xf000, 0xf000) AM_READ_PORT("BITSW") AM_DEVWRITE(SOUND, "dac", wldarrow_dac_1_w) + AM_RANGE(0xf000, 0xf000) AM_READ_PORT("BITSW") AM_DEVWRITE("dac", wldarrow_dac_1_w) AM_RANGE(0xf004, 0xf004) AM_READ_PORT("IN1") AM_WRITE(lights_1_w) AM_RANGE(0xf006, 0xf006) AM_READ_PORT("IN2") AM_WRITE(lights_2_w) AM_RANGE(0xf008, 0xf008) AM_WRITE(counter_w) - AM_RANGE(0xf00f, 0xf00f) AM_DEVWRITE(SOUND, "dac", wldarrow_dac_2_w) - AM_RANGE(0xf0f0, 0xf0f0) AM_DEVWRITE(SOUND, "dac", wldarrow_dac_3_w) - AM_RANGE(0xf0ff, 0xf0ff) AM_DEVWRITE(SOUND, "dac", wldarrow_dac_4_w) + AM_RANGE(0xf00f, 0xf00f) AM_DEVWRITE("dac", wldarrow_dac_2_w) + AM_RANGE(0xf0f0, 0xf0f0) AM_DEVWRITE("dac", wldarrow_dac_3_w) + AM_RANGE(0xf0ff, 0xf0ff) AM_DEVWRITE("dac", wldarrow_dac_4_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c index c31f02fa07f..204b1edfd4a 100644 --- a/src/mame/drivers/wolfpack.c +++ b/src/mame/drivers/wolfpack.c @@ -61,7 +61,7 @@ static CUSTOM_INPUT( wolfpack_dial_r ) static READ8_HANDLER( wolfpack_misc_r ) { - const device_config *device = devtag_get_device(space->machine, SOUND, "speech"); + const device_config *device = devtag_get_device(space->machine, "speech"); UINT8 val = 0; /* BIT0 => SPEECH BUSY */ @@ -138,7 +138,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2001, 0x2001) AM_WRITE(wolfpack_sonar_ping_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(wolfpack_sirlat_w) AM_RANGE(0x2003, 0x2003) AM_WRITE(wolfpack_pt_sound_w) - AM_RANGE(0x2004, 0x2004) AM_DEVWRITE(SOUND, "speech", wolfpack_start_speech_w) + AM_RANGE(0x2004, 0x2004) AM_DEVWRITE("speech", wolfpack_start_speech_w) AM_RANGE(0x2005, 0x2005) AM_WRITE(wolfpack_launch_torpedo_w) AM_RANGE(0x2006, 0x2006) AM_WRITE(wolfpack_low_explo_w) AM_RANGE(0x2007, 0x2007) AM_WRITE(wolfpack_screw_cont_w) @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3000) AM_WRITE(wolfpack_audamp_w) AM_RANGE(0x3001, 0x3001) AM_WRITE(wolfpack_pt_horz_w) AM_RANGE(0x3003, 0x3003) AM_WRITE(wolfpack_pt_pic_w) - AM_RANGE(0x3004, 0x3004) AM_DEVWRITE(SOUND, "speech", wolfpack_word_w) + AM_RANGE(0x3004, 0x3004) AM_DEVWRITE("speech", wolfpack_word_w) AM_RANGE(0x3007, 0x3007) AM_WRITE(wolfpack_coldetres_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(wolfpack_ship_h_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(wolfpack_torpedo_pic_w) diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c index 2ed9c0b8738..ef56e951634 100644 --- a/src/mame/drivers/wrally.c +++ b/src/mame/drivers/wrally.c @@ -114,7 +114,7 @@ static ADDRESS_MAP_START( wrally_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700004, 0x700005) AM_READ_PORT("WHEEL") AM_RANGE(0x700008, 0x700009) AM_READ_PORT("SYSTEM") AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ - AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff) /* OKI6295 status/data register */ + AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) /* OKI6295 status/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(SMH_NOP) /* Sound muting */ diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 0a60dbe0517..b8bc5e6652c 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -189,8 +189,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index e709c7eefd5..73fbc736a7f 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -88,10 +88,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) - AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) + AM_RANGE(0xd800, 0xd800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(SOUND, "oki", oki_bankswitch_w) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("oki", oki_bankswitch_w) ADDRESS_MAP_END /******************************************************************************* diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index 4d1d609bc71..8b3ccb9b174 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -338,8 +338,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) - AM_RANGE(0x2800, 0x2801) AM_DEVWRITE(SOUND, "ym1", ym2203_w) - AM_RANGE(0x3000, 0x3001) AM_DEVWRITE(SOUND, "ym2", ym2203_w) + AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ym1", ym2203_w) + AM_RANGE(0x3000, 0x3001) AM_DEVWRITE("ym2", ym2203_w) AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 6a4391c1404..ef1a0f6bcb4 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -293,10 +293,10 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static void ym_set_mixing(const device_config *device, double left, double right) { - flt_volume_set_volume(devtag_get_device(device->machine, SOUND, "filter1l"), (71.0*left)/55.0); - flt_volume_set_volume(devtag_get_device(device->machine, SOUND, "filter1r"), (71.0*right)/55.0); - flt_volume_set_volume(devtag_get_device(device->machine, SOUND, "filter2l"), (71.0*left)/55.0); - flt_volume_set_volume(devtag_get_device(device->machine, SOUND, "filter2r"), (71.0*right)/55.0); + flt_volume_set_volume(devtag_get_device(device->machine, "filter1l"), (71.0*left)/55.0); + flt_volume_set_volume(devtag_get_device(device->machine, "filter1r"), (71.0*right)/55.0); + flt_volume_set_volume(devtag_get_device(device->machine, "filter2l"), (71.0*left)/55.0); + flt_volume_set_volume(devtag_get_device(device->machine, "filter2r"), (71.0*right)/55.0); } static TIMER_CALLBACK( dmaend_callback ) @@ -395,8 +395,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREADWRITE(SOUND, "konami", k054539_r, k054539_w) - AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) + AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) @@ -606,7 +606,7 @@ static MACHINE_RESET( xexex ) suspension_active = 0; resume_trigger = 0; frame = -1; - k054539_init_flags(devtag_get_device(machine, SOUND, "konami"), K054539_REVERSE_STEREO); + k054539_init_flags(devtag_get_device(machine, "konami"), K054539_REVERSE_STEREO); } static STATE_POSTLOAD( xexex_postload ) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index a2f0092099b..6596d0c575b 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -181,8 +181,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) 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_DEVREADWRITE(SOUND, "konami", k054539_r, k054539_w) - AM_RANGE(0xe800, 0xe801) AM_MIRROR(0x0400) AM_DEVREADWRITE(SOUND, "ym", ym2151_r, ym2151_w) + AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) + AM_RANGE(0xe800, 0xe801) AM_MIRROR(0x0400) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w) diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index 52c57ddfb8f..525e49d716b 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -98,8 +98,8 @@ static ADDRESS_MAP_START( xorworld_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1") AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P2") AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW") - AM_RANGE(0x800000, 0x800001) AM_DEVWRITE8(SOUND, "saa", saa1099_data_w, 0x00ff) - AM_RANGE(0x800002, 0x800003) AM_DEVWRITE8(SOUND, "saa", saa1099_control_w, 0x00ff) + AM_RANGE(0x800000, 0x800001) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff) + AM_RANGE(0x800002, 0x800003) AM_DEVWRITE8("saa", saa1099_control_w, 0x00ff) AM_RANGE(0xa00008, 0xa00009) AM_WRITE(eeprom_chip_select_w) AM_RANGE(0xa0000a, 0xa0000b) AM_WRITE(eeprom_serial_clock_w) AM_RANGE(0xa0000c, 0xa0000d) AM_WRITE(eeprom_data_w) diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c index 0adde8a8d48..2516c39c01d 100644 --- a/src/mame/drivers/xtheball.c +++ b/src/mame/drivers/xtheball.c @@ -235,7 +235,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x03040160, 0x0304016f) AM_READ_PORT("SERVICE") AM_RANGE(0x03040170, 0x0304017f) AM_READ_PORT("SERVICE1") AM_RANGE(0x03040180, 0x0304018f) AM_READ(analogy_watchdog_r) - AM_RANGE(0x03060000, 0x0306000f) AM_DEVWRITE8(SOUND, "dac", dac_w, 0xff00) + AM_RANGE(0x03060000, 0x0306000f) AM_DEVWRITE8("dac", dac_w, 0xff00) AM_RANGE(0x04000000, 0x057fffff) AM_ROM AM_REGION("user2", 0) AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("user1", 0) diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index 89b0dbe7999..a11f94f6510 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -104,8 +104,8 @@ static MACHINE_START( xxmissio ) static ADDRESS_MAP_START( map1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x8002, 0x8003) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x8002, 0x8003) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_RANGE(0xa001, 0xa001) AM_READ_PORT("P2") @@ -128,8 +128,8 @@ static ADDRESS_MAP_START( map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) - AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE(SOUND, "ym1", ym2203_r, ym2203_w) - AM_RANGE(0x8002, 0x8003) AM_DEVREADWRITE(SOUND, "ym2", ym2203_r, ym2203_w) + AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) + AM_RANGE(0x8002, 0x8003) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0x8006, 0x8006) AM_WRITE(xxmissio_bank_sel_w) AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index 1a49df15aa7..c8f1baf2fac 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -148,8 +148,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x20, 0x20) AM_READNOP AM_DEVWRITE(SOUND, "sn1", sn76496_w) /* SN76496 ready signal */ - AM_RANGE(0x21, 0x21) AM_READNOP AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x20, 0x20) AM_READNOP AM_DEVWRITE("sn1", sn76496_w) /* SN76496 ready signal */ + AM_RANGE(0x21, 0x21) AM_READNOP AM_DEVWRITE("sn2", sn76496_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(SMH_NOP) /* mc6845 */ diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index 67830cb65a8..83b702200ac 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -87,12 +87,12 @@ static INTERRUPT_GEN( yiear_nmi_interrupt ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0000) AM_DEVREAD(SOUND, "vlm", yiear_speech_r) + AM_RANGE(0x0000, 0x0000) AM_DEVREAD("vlm", yiear_speech_r) AM_RANGE(0x4000, 0x4000) AM_WRITE(yiear_control_w) AM_RANGE(0x4800, 0x4800) AM_WRITE(konami_SN76496_latch_w) - AM_RANGE(0x4900, 0x4900) AM_DEVWRITE(SOUND, "sn", konami_SN76496_w) - AM_RANGE(0x4a00, 0x4a00) AM_DEVWRITE(SOUND, "vlm", yiear_VLM5030_control_w) - AM_RANGE(0x4b00, 0x4b00) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) + AM_RANGE(0x4900, 0x4900) AM_DEVWRITE("sn", konami_SN76496_w) + AM_RANGE(0x4a00, 0x4a00) AM_DEVWRITE("vlm", yiear_VLM5030_control_w) + AM_RANGE(0x4b00, 0x4b00) AM_DEVWRITE("vlm", vlm5030_data_w) AM_RANGE(0x4c00, 0x4c00) AM_READ_PORT("DSW1") AM_RANGE(0x4d00, 0x4d00) AM_READ_PORT("DSW2") AM_RANGE(0x4e00, 0x4e00) AM_READ_PORT("SYSTEM") diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c index 93d2118bf57..1b9a8f7afb2 100644 --- a/src/mame/drivers/yumefuda.c +++ b/src/mame/drivers/yumefuda.c @@ -238,8 +238,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_WRITE(yumefuda_videoregs_w) // HD46505SP video registers - AM_RANGE(0x40, 0x40) AM_DEVREAD(SOUND, "ay", ay8910_r) - AM_RANGE(0x40, 0x41) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x40, 0x40) AM_DEVREAD("ay", ay8910_r) + AM_RANGE(0x40, 0x41) AM_DEVWRITE("ay", ay8910_address_data_w) AM_RANGE(0x80, 0x80) AM_WRITE(mux_w) AM_RANGE(0x81, 0x81) AM_READ(eeprom_r) AM_RANGE(0x82, 0x82) AM_READ(mux_r) diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index dd17e5dd5ab..370af6bd3f6 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -140,7 +140,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800114, 0x800117) AM_RAM AM_BASE(&yunsun16_scroll_0 ) // Scrolling AM_RANGE(0x800154, 0x800155) AM_RAM AM_BASE(&yunsun16_priority ) // Priority AM_RANGE(0x800180, 0x800181) AM_WRITE(yunsun16_sound_bank_w ) // Sound - AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff ) // Sound + AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff ) // Sound AM_RANGE(0x8001fe, 0x8001ff) AM_WRITE(SMH_NOP ) // ? 0 (during int) AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE(yunsun16_vram_1_w) AM_BASE(&yunsun16_vram_1 ) // Layer 1 @@ -187,9 +187,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x11) AM_DEVREADWRITE(SOUND, "ym", ym3812_r, ym3812_w ) + AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w ) AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r ) // From Main CPU - AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w ) // M6295 + AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w ) // M6295 ADDRESS_MAP_END diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index f48378eb9ff..873f7e05ce2 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -156,9 +156,9 @@ static WRITE8_HANDLER( yunsung8_adpcm_w ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK2,SMH_ROM ) // Banked ROM - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE(SOUND, "msm", yunsung8_sound_bankswitch_w ) // ROM Bank + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", yunsung8_sound_bankswitch_w ) // ROM Bank AM_RANGE(0xe400, 0xe400) AM_WRITE(yunsung8_adpcm_w ) - AM_RANGE(0xec00, 0xec01) AM_DEVWRITE(SOUND, "ym", ym3812_w ) + AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ym", ym3812_w ) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index 7230ef90049..9899e59e4fd 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -96,10 +96,10 @@ static WRITE8_DEVICE_HANDLER( ay8910_port0a_w ) { /* TODO: is this right? it sound awful */ static const int table[4] = { 0x05, 0x1b, 0x0b, 0x55 }; - dac_signed_data_w(devtag_get_device(device->machine, SOUND, "dac1"),table[(data & 0x06) >> 1]); + dac_signed_data_w(devtag_get_device(device->machine, "dac1"),table[(data & 0x06) >> 1]); } else - dac_signed_data_w(devtag_get_device(device->machine, SOUND, "dac1"),0x80); + dac_signed_data_w(devtag_get_device(device->machine, "dac1"),0x80); } @@ -110,7 +110,7 @@ static int active_8910, port0a, acs; static READ8_HANDLER( zaccaria_port0a_r ) { - return ay8910_r(devtag_get_device(space->machine, SOUND, (active_8910 == 0) ? "ay1" : "ay2"), 0); + return ay8910_r(devtag_get_device(space->machine, (active_8910 == 0) ? "ay1" : "ay2"), 0); } static WRITE8_HANDLER( zaccaria_port0a_w ) @@ -127,7 +127,7 @@ static WRITE8_HANDLER( zaccaria_port0b_w ) if ((last & 0x02) == 0x02 && (data & 0x02) == 0x00) { /* bit 0 goes to the 8910 #0 BC1 pin */ - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay1"), last, port0a); + ay8910_data_address_w(devtag_get_device(space->machine, "ay1"), last, port0a); } else if ((last & 0x02) == 0x00 && (data & 0x02) == 0x02) { @@ -139,7 +139,7 @@ static WRITE8_HANDLER( zaccaria_port0b_w ) if ((last & 0x08) == 0x08 && (data & 0x08) == 0x00) { /* bit 2 goes to the 8910 #1 BC1 pin */ - ay8910_data_address_w(devtag_get_device(space->machine, SOUND, "ay2"), last >> 2, port0a); + ay8910_data_address_w(devtag_get_device(space->machine, "ay2"), last >> 2, port0a); } else if ((last & 0x08) == 0x00 && (data & 0x08) == 0x08) { @@ -166,7 +166,7 @@ static int port1a,port1b; static READ8_HANDLER( zaccaria_port1a_r ) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); if (~port1b & 1) return tms5220_status_r(tms,0); else return port1a; } @@ -178,7 +178,7 @@ static WRITE8_HANDLER( zaccaria_port1a_w ) static WRITE8_HANDLER( zaccaria_port1b_w ) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); port1b = data; // bit 0 = /RS @@ -341,7 +341,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6c00, 0x6c07) AM_READ(zaccaria_prot2_r) AM_RANGE(0x6e00, 0x6e00) AM_READWRITE(zaccaria_dsw_r, sound_command_w) AM_RANGE(0x7000, 0x77ff) AM_RAM - AM_RANGE(0x7800, 0x7803) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0x7800, 0x7803) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x7c00, 0x7c00) AM_READ(watchdog_reset_r) AM_RANGE(0x8000, 0xdfff) AM_ROM ADDRESS_MAP_END @@ -356,7 +356,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map_2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM AM_RANGE(0x0090, 0x0093) AM_READWRITE(pia_1_r, pia_1_w) - AM_RANGE(0x1000, 0x1000) AM_DEVWRITE(SOUND, "dac2", mc1408_data_w) /* MC1408 */ + AM_RANGE(0x1000, 0x1000) AM_DEVWRITE("dac2", mc1408_data_w) /* MC1408 */ AM_RANGE(0x1400, 0x1400) AM_WRITE(sound1_command_w) AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) AM_RANGE(0xa000, 0xbfff) AM_ROM diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index f2ba0f8aa93..2081327344f 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -502,7 +502,7 @@ static ADDRESS_MAP_START( zaxxon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc002) AM_MIRROR(0x18f8) AM_WRITE(zaxxon_coin_enable_w) AM_RANGE(0xc003, 0xc004) AM_MIRROR(0x18f8) AM_WRITE(zaxxon_coin_counter_w) AM_RANGE(0xc006, 0xc006) AM_MIRROR(0x18f8) AM_WRITE(zaxxon_flipscreen_w) - AM_RANGE(0xe03c, 0xe03f) AM_MIRROR(0x1f00) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0xe03c, 0xe03f) AM_MIRROR(0x1f00) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0xe0f0, 0xe0f0) AM_MIRROR(0x1f00) AM_WRITE(int_enable_w) AM_RANGE(0xe0f1, 0xe0f1) AM_MIRROR(0x1f00) AM_WRITE(zaxxon_fg_color_w) AM_RANGE(0xe0f8, 0xe0f9) AM_MIRROR(0x1f00) AM_WRITE(zaxxon_bg_position_w) @@ -541,9 +541,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( congo_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_DEVWRITE(SOUND, "sn1", sn76496_w) - AM_RANGE(0x8000, 0x8003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1fff) AM_DEVWRITE(SOUND, "sn2", sn76496_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76496_w) + AM_RANGE(0x8000, 0x8003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn2", sn76496_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 97d7cc3b603..f9af4696704 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -82,7 +82,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE(SOUND, "oki", okim6295_r, okim6295_w) + AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 6bcaccff167..000863f8eab 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -360,7 +360,7 @@ static ADDRESS_MAP_START( zn_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f800000, 0x1f8003ff) AM_RAM /* scratchpad */ AM_RANGE(0x1f801000, 0x1f80100f) AM_RAM /* ?? */ AM_RANGE(0x1f801010, 0x1f801013) AM_NOP - AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREADWRITE(SOUND, "spu", psx_spu_delay_r, psx_spu_delay_w) + AM_RANGE(0x1f801014, 0x1f801017) AM_DEVREADWRITE("spu", psx_spu_delay_r, psx_spu_delay_w) AM_RANGE(0x1f801018, 0x1f80101f) AM_NOP AM_RANGE(0x1f801020, 0x1f801023) AM_READWRITE(psx_com_delay_r, psx_com_delay_w) AM_RANGE(0x1f801024, 0x1f80102f) AM_NOP @@ -371,7 +371,7 @@ static ADDRESS_MAP_START( zn_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f801100, 0x1f80112f) AM_READWRITE(psx_counter_r, psx_counter_w) AM_RANGE(0x1f801810, 0x1f801817) AM_READWRITE(psx_gpu_r, psx_gpu_w) AM_RANGE(0x1f801820, 0x1f801827) AM_READWRITE(psx_mdec_r, psx_mdec_w) - AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE(SOUND, "spu", psx_spu_r, psx_spu_w) + AM_RANGE(0x1f801c00, 0x1f801dff) AM_DEVREADWRITE("spu", psx_spu_r, psx_spu_w) AM_RANGE(0x1f802020, 0x1f802033) AM_RAM /* ?? */ AM_RANGE(0x1f802040, 0x1f802043) AM_WRITENOP AM_RANGE(0x1fa00000, 0x1fa00003) AM_READ_PORT("P1") @@ -386,7 +386,7 @@ static ADDRESS_MAP_START( zn_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1fa30000, 0x1fa30003) AM_NOP /* ?? */ AM_RANGE(0x1fa40000, 0x1fa40003) AM_READNOP /* ?? */ AM_RANGE(0x1fa60000, 0x1fa60003) AM_READNOP /* ?? */ - AM_RANGE(0x1faf0000, 0x1faf07ff) AM_DEVREADWRITE8(AT28C16, "at28c16", at28c16_r, at28c16_w, 0xffffffff) /* eeprom */ + AM_RANGE(0x1faf0000, 0x1faf07ff) AM_DEVREADWRITE8("at28c16", at28c16_r, at28c16_w, 0xffffffff) /* eeprom */ AM_RANGE(0x1fb20000, 0x1fb20007) AM_READ(unknown_r) AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_ROM AM_SHARE(2) AM_REGION("user1", 0) /* bios */ AM_RANGE(0x80000000, 0x803fffff) AM_RAM AM_SHARE(1) /* ram mirror */ @@ -685,9 +685,9 @@ static MACHINE_RESET( coh1000c ) static ADDRESS_MAP_START( qsound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(10) /* banked (contains music data) */ - AM_RANGE(0xd000, 0xd002) AM_DEVWRITE(SOUND, "qsound", qsound_w) + AM_RANGE(0xd000, 0xd002) AM_DEVWRITE("qsound", qsound_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(qsound_bankswitch_w) - AM_RANGE(0xd007, 0xd007) AM_DEVREAD(SOUND, "qsound", qsound_r) + AM_RANGE(0xd007, 0xd007) AM_DEVREAD("qsound", qsound_r) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -1199,7 +1199,7 @@ static ADDRESS_MAP_START( fx1a_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE(SOUND, "ym", ym2610_r, ym2610_w) + AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ym", ym2610_r, ym2610_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(SMH_NOP) /* pan */ @@ -1592,7 +1592,7 @@ static void atpsx_interrupt(const device_config *device, int state) static void atpsx_dma_read( running_machine *machine, UINT32 n_address, INT32 n_size ) { - const device_config *ide = device_list_find_by_tag(machine->config->devicelist, IDE_CONTROLLER, "ide"); + const device_config *ide = devtag_get_device(machine, "ide"); logerror("DMA read: %d bytes (%d words) to %08x\n", n_size<<2, n_size, n_address); @@ -1620,7 +1620,7 @@ static void atpsx_dma_write( running_machine *machine, UINT32 n_address, INT32 n static DRIVER_INIT( coh1000w ) { - const device_config *ide = device_list_find_by_tag(machine->config->devicelist, IDE_CONTROLLER, "ide"); + const device_config *ide = devtag_get_device(machine, "ide"); memory_install_read32_handler ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, SMH_BANK1 ); memory_install_write32_handler ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f000003, 0, 0, SMH_NOP ); @@ -1636,7 +1636,7 @@ static MACHINE_RESET( coh1000w ) memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ zn_machine_init(machine); - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); psx_dma_install_read_handler(5, atpsx_dma_read); psx_dma_install_write_handler(5, atpsx_dma_write); } @@ -1829,7 +1829,7 @@ static MACHINE_RESET( coh1002e ) static ADDRESS_MAP_START( psarc_snd_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x0fffff) AM_RAM - AM_RANGE(0x100000, 0x10001f) AM_DEVREADWRITE8( SOUND, "ymf", ymf271_r, ymf271_w, 0x00ff ) + AM_RANGE(0x100000, 0x10001f) AM_DEVREADWRITE8( "ymf", ymf271_r, ymf271_w, 0x00ff ) AM_RANGE(0x180008, 0x180009) AM_READ8( soundlatch_r, 0x00ff ) AM_RANGE(0x000000, 0x07ffff) AM_WRITENOP AM_RANGE(0x100020, 0xffffff) AM_WRITENOP @@ -2293,7 +2293,7 @@ static DRIVER_INIT( coh1000a ) if( ( !strcmp( machine->gamedrv->name, "jdredd" ) ) || ( !strcmp( machine->gamedrv->name, "jdreddb" ) ) ) { - const device_config *ide = device_list_find_by_tag(machine->config->devicelist, IDE_CONTROLLER, "ide"); + const device_config *ide = devtag_get_device(machine, "ide"); memory_install_read32_device_handler( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), ide, 0x1fbfff8c, 0x1fbfff8f, 0, 0, jdredd_idestat_r ); memory_install_write32_handler ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1fbfff8c, 0x1fbfff8f, 0, 0, SMH_NOP ); @@ -2310,7 +2310,7 @@ static MACHINE_RESET( coh1000a ) if( ( !strcmp( machine->gamedrv->name, "jdredd" ) ) || ( !strcmp( machine->gamedrv->name, "jdreddb" ) ) ) { - devtag_reset(machine, IDE_CONTROLLER, "ide"); + devtag_reset(machine, "ide"); } } @@ -2741,7 +2741,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cbaj_z80_port_map, ADDRESS_SPACE_IO, 8) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE( 0x84, 0x85 ) AM_DEVREADWRITE( SOUND, "ymz", ymz280b_r, ymz280b_w ) + AM_RANGE( 0x84, 0x85 ) AM_DEVREADWRITE( "ymz", ymz280b_r, ymz280b_w ) AM_RANGE( 0x90, 0x90 ) AM_READWRITE( cbaj_z80_latch_r, cbaj_z80_latch_w ) AM_RANGE( 0x91, 0x91 ) AM_READ( cbaj_z80_ready_r ) ADDRESS_MAP_END diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index 24a07fac47d..a540bd759ce 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -80,7 +80,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_DEVWRITE(SOUND, "ay", ay8910_address_data_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay", ay8910_address_data_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 49bf23c8891..61631343fbe 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -510,9 +510,9 @@ static READ16_HANDLER( dual539_r ) UINT16 ret = 0; if (ACCESSING_BITS_0_7) - ret |= k054539_r(devtag_get_device(space->machine, SOUND, "konami2"), offset); + ret |= k054539_r(devtag_get_device(space->machine, "konami2"), offset); if (ACCESSING_BITS_8_15) - ret |= k054539_r(devtag_get_device(space->machine, SOUND, "konami1"), offset)<<8; + ret |= k054539_r(devtag_get_device(space->machine, "konami1"), offset)<<8; return ret; } @@ -520,9 +520,9 @@ static READ16_HANDLER( dual539_r ) static WRITE16_HANDLER( dual539_w ) { if (ACCESSING_BITS_0_7) - k054539_w(devtag_get_device(space->machine, SOUND, "konami2"), offset, data); + k054539_w(devtag_get_device(space->machine, "konami2"), offset, data); if (ACCESSING_BITS_8_15) - k054539_w(devtag_get_device(space->machine, SOUND, "konami1"), offset, data>>8); + k054539_w(devtag_get_device(space->machine, "konami1"), offset, data>>8); } static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/includes/naomibd.h b/src/mame/includes/naomibd.h index 65f36544ff9..24650982fc8 100644 --- a/src/mame/includes/naomibd.h +++ b/src/mame/includes/naomibd.h @@ -72,10 +72,10 @@ struct _naomibd_config MDRV_DEVICE_CONFIG_DATAPTR(naomibd_config, picregiontag, _region) #define MDRV_NAOMIBD_MODIFY(_tag) \ - MDRV_DEVICE_MODIFY(_tag, NAOMI_BOARD) + MDRV_DEVICE_MODIFY(_tag) #define MDRV_NAOMIBD_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, NAOMI_BOARD) + MDRV_DEVICE_REMOVE(_tag) /*#define MDRV_NAOMIBD_TMU_MEMORY(_tmu, _tmumem) \ MDRV_DEVICE_CONFIG_DATA32(naomibd_config, tmumem##_tmu, _tmumem)*/ diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c index fb108c22f1d..87127df3a23 100644 --- a/src/mame/machine/amiga.c +++ b/src/mame/machine/amiga.c @@ -281,8 +281,8 @@ static void amiga_m68k_reset(const device_config *device) logerror("Executed RESET at PC=%06x\n", cpu_get_pc(space->cpu)); /* Initialize the various chips */ - devtag_reset(device->machine, CIA8520, "cia_0"); - devtag_reset(device->machine, CIA8520, "cia_1"); + devtag_reset(device->machine, "cia_0"); + devtag_reset(device->machine, "cia_1"); custom_reset(device->machine); autoconfig_reset(device->machine); @@ -326,8 +326,8 @@ MACHINE_RESET( amiga ) static TIMER_CALLBACK( scanline_callback ) { int scanline = param; - const device_config *cia_0 = device_list_find_by_tag(machine->config->devicelist, CIA8520, "cia_0"); - const device_config *cia_1 = device_list_find_by_tag(machine->config->devicelist, CIA8520, "cia_1"); + const device_config *cia_0 = devtag_get_device(machine, "cia_0"); + const device_config *cia_1 = devtag_get_device(machine, "cia_1"); /* on the first scanline, we do some extra bookkeeping */ if (scanline == 0) @@ -1026,14 +1026,14 @@ READ16_HANDLER( amiga_cia_r ) /* offsets 0000-07ff reference CIA B, and are accessed via the MSB */ if ((offset & 0x0800) == 0) { - cia = device_list_find_by_tag(space->machine->config->devicelist, CIA8520, "cia_1"); + cia = devtag_get_device(space->machine, "cia_1"); shift = 8; } /* offsets 0800-0fff reference CIA A, and are accessed via the LSB */ else { - cia = device_list_find_by_tag(space->machine->config->devicelist, CIA8520, "cia_0"); + cia = devtag_get_device(space->machine, "cia_0"); shift = 0; } @@ -1066,7 +1066,7 @@ WRITE16_HANDLER( amiga_cia_w ) { if (!ACCESSING_BITS_8_15) return; - cia = device_list_find_by_tag(space->machine->config->devicelist, CIA8520, "cia_1"); + cia = devtag_get_device(space->machine, "cia_1"); data >>= 8; } @@ -1075,7 +1075,7 @@ WRITE16_HANDLER( amiga_cia_w ) { if (!ACCESSING_BITS_0_7) return; - cia = device_list_find_by_tag(space->machine->config->devicelist, CIA8520, "cia_0"); + cia = devtag_get_device(space->machine, "cia_0"); data &= 0xff; } @@ -1397,8 +1397,8 @@ WRITE16_HANDLER( amiga_custom_w ) CUSTOM_REG(REG_SERDATR) &= ~0x8000; data = (data & 0x8000) ? (CUSTOM_REG(offset) | (data & 0x7fff)) : (CUSTOM_REG(offset) & ~(data & 0x7fff)); - cia_0 = device_list_find_by_tag(space->machine->config->devicelist, CIA8520, "cia_0"); - cia_1 = device_list_find_by_tag(space->machine->config->devicelist, CIA8520, "cia_1"); + cia_0 = devtag_get_device(space->machine, "cia_0"); + cia_1 = devtag_get_device(space->machine, "cia_1"); if ( cia_get_irq( cia_0 ) ) data |= INTENA_PORTS; if ( cia_get_irq( cia_1 ) ) data |= INTENA_EXTER; CUSTOM_REG(offset) = data; diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c index a05e002ffdd..43aec990646 100644 --- a/src/mame/machine/archimds.c +++ b/src/mame/machine/archimds.c @@ -314,7 +314,7 @@ static void latch_timer_cnt(int tmr) READ32_HANDLER(ioc_r) { #ifdef MESS - device_config *fdc = (device_config*)devtag_get_device(space->machine, WD1772, "wd1772"); + device_config *fdc = (device_config*)devtag_get_device(space->machine, "wd1772"); #endif if (offset >= 0x80000 && offset < 0xc0000) { @@ -364,7 +364,7 @@ READ32_HANDLER(ioc_r) WRITE32_HANDLER(ioc_w) { #ifdef MESS - device_config *fdc = (device_config*)devtag_get_device(space->machine, WD1772, "wd1772"); + device_config *fdc = (device_config*)devtag_get_device(space->machine, "wd1772"); #endif if (offset >= 0x80000 && offset < 0xc0000) { @@ -593,7 +593,7 @@ WRITE32_HANDLER(memc_w) else { timer_adjust_oneshot(snd_timer, attotime_never, 0); - dac_signed_data_w(devtag_get_device(space->machine, SOUND, "dac"), 0x80); + dac_signed_data_w(devtag_get_device(space->machine, "dac"), 0x80); } break; diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index 575af3dee27..f2a997b65dd 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -517,7 +517,7 @@ static const UINT8 keys[64][4] = { void a800_handle_keyboard(running_machine *machine) { - const device_config *pokey = devtag_get_device(machine, SOUND, "pokey"); + const device_config *pokey = devtag_get_device(machine, "pokey"); static int atari_last = 0xff; int i, modifiers, atari_code; char tag[64]; @@ -563,7 +563,7 @@ void a800_handle_keyboard(running_machine *machine) /* absolutely no clue what to do here :((( */ void a5200_handle_keypads(running_machine *machine) { - const device_config *pokey = devtag_get_device(machine, SOUND, "pokey"); + const device_config *pokey = devtag_get_device(machine, "pokey"); int i, modifiers; static int atari_last = 0xff; @@ -693,7 +693,7 @@ static void a800_setbank(running_machine *machine, int n) static void pokey_reset(running_machine *machine) { - const device_config *pokey = devtag_get_device(machine, SOUND, "pokey"); + const device_config *pokey = devtag_get_device(machine, "pokey"); pokey_w(pokey,15,0); } @@ -718,7 +718,7 @@ static UINT8 console_read(const address_space *space) static void console_write(const address_space *space, UINT8 data) { - const device_config *dac = devtag_get_device(space->machine, SOUND, "dac"); + const device_config *dac = devtag_get_device(space->machine, "dac"); if (data & 0x08) dac_data_w(dac, -120); else @@ -747,7 +747,7 @@ static void atari_machine_start(running_machine *machine, int type, const pia682 memset(>ia_intf, 0, sizeof(gtia_intf)); if (input_port_by_tag(machine->portconfig, "console") != NULL) gtia_intf.console_read = console_read; - if (devtag_get_device(machine, SOUND, "dac") != NULL) + if (devtag_get_device(machine, "dac") != NULL) gtia_intf.console_write = console_write; gtia_init(machine, >ia_intf); diff --git a/src/mame/machine/atari_vg.h b/src/mame/machine/atari_vg.h index eabded6e39f..324587d68da 100644 --- a/src/mame/machine/atari_vg.h +++ b/src/mame/machine/atari_vg.h @@ -14,7 +14,7 @@ MDRV_DEVICE_ADD(_tag, ATARIVGEAROM, 0) #define MDRV_ATARIVGEAROM_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, ATARIVGEAROM) + MDRV_DEVICE_REMOVE(_tag) /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c index 1e5c3d5533d..c26c4bd5874 100644 --- a/src/mame/machine/atarifb.c +++ b/src/mame/machine/atarifb.c @@ -18,7 +18,7 @@ static int sign_x_4, sign_y_4; WRITE8_HANDLER( atarifb_out1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); CTRLD = data; @@ -31,7 +31,7 @@ WRITE8_HANDLER( atarifb_out1_w ) WRITE8_HANDLER( atarifb4_out1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); CTRLD = data; @@ -46,7 +46,7 @@ WRITE8_HANDLER( atarifb4_out1_w ) WRITE8_HANDLER( abaseb_out1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); CTRLD = data; @@ -72,7 +72,7 @@ WRITE8_HANDLER( abaseb_out1_w ) WRITE8_HANDLER( soccer_out1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); CTRLD = data; @@ -96,7 +96,7 @@ WRITE8_HANDLER( soccer_out1_w ) WRITE8_HANDLER( atarifb_out2_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); discrete_sound_w(discrete, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd @@ -106,7 +106,7 @@ WRITE8_HANDLER( atarifb_out2_w ) WRITE8_HANDLER( soccer_out2_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); discrete_sound_w(discrete, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index c7555534894..2d326d3e6c0 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -189,7 +189,7 @@ MACHINE_RESET( balsente ) { char name[10]; sprintf(name, "cem%d", i+1); - cem_device[i] = devtag_get_device(machine, SOUND, name); + cem_device[i] = devtag_get_device(machine, name); assert(cem_device[i] != NULL); } diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index 3721c4d0732..0fda09a6300 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -19,18 +19,18 @@ static WRITE8_DEVICE_HANDLER( b_via_1_pb_w ); const via6522_interface b_via_0_interface = { /*inputs : A/B */ DEVCB_NULL, DEVCB_HANDLER(b_via_0_pb_r), - /*inputs : CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_DEVICE_HANDLER(VIA6522, "via6522_1", via_ca2_r), DEVCB_HANDLER(b_via_0_ca2_r), DEVCB_DEVICE_HANDLER(VIA6522, "via6522_1", via_ca1_r), + /*inputs : CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_DEVICE_HANDLER("via6522_1", via_ca2_r), DEVCB_HANDLER(b_via_0_ca2_r), DEVCB_DEVICE_HANDLER("via6522_1", via_ca1_r), /*outputs: A/B */ DEVCB_HANDLER(b_via_0_pa_w), DEVCB_HANDLER(b_via_0_pb_w), - /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_HANDLER(b_via_0_ca2_w), DEVCB_DEVICE_HANDLER(VIA6522, "via6522_1", via_ca1_w), + /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_HANDLER(b_via_0_ca2_w), DEVCB_DEVICE_HANDLER("via6522_1", via_ca1_w), /*irq */ DEVCB_CPU_INPUT_LINE("maincpu", M6809_IRQ_LINE) }; const via6522_interface b_via_1_interface = { /*inputs : A/B */ DEVCB_HANDLER(b_via_1_pa_r), DEVCB_HANDLER(b_via_1_pb_r), - /*inputs : CA/B1,CA/B2 */ DEVCB_DEVICE_HANDLER(VIA6522, "via6522_0", via_cb2_r), DEVCB_NULL, DEVCB_DEVICE_HANDLER(VIA6522, "via6522_0", via_cb1_r), DEVCB_NULL, + /*inputs : CA/B1,CA/B2 */ DEVCB_DEVICE_HANDLER("via6522_0", via_cb2_r), DEVCB_NULL, DEVCB_DEVICE_HANDLER("via6522_0", via_cb1_r), DEVCB_NULL, /*outputs: A/B */ DEVCB_HANDLER(b_via_1_pa_w), DEVCB_HANDLER(b_via_1_pb_w), - /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_DEVICE_HANDLER(VIA6522, "via6522_0", via_cb1_w), DEVCB_NULL, + /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_DEVICE_HANDLER("via6522_0", via_cb1_w), DEVCB_NULL, /*irq */ DEVCB_CPU_INPUT_LINE("audiocpu", M6809_IRQ_LINE) }; @@ -108,7 +108,7 @@ WRITE8_HANDLER( beezer_bankswitch_w ) { if ((data & 0x07) == 0) { - const device_config *via_0 = device_list_find_by_tag(space->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via_0 = devtag_get_device(space->machine, "via6522_0"); memory_install_write8_handler(space, 0xc600, 0xc7ff, 0, 0, watchdog_reset_w); memory_install_write8_handler(space, 0xc800, 0xc9ff, 0, 0, beezer_map_w); memory_install_read8_handler(space, 0xca00, 0xcbff, 0, 0, beezer_line_r); diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c index 003278ecf1b..507a3018fd3 100644 --- a/src/mame/machine/cubocd32.c +++ b/src/mame/machine/cubocd32.c @@ -757,7 +757,7 @@ READ32_HANDLER(amiga_akiko32_r) switch( offset ) { case 0x00/4: /* ID */ - if ( akiko.cdrom != NULL ) cdda_set_cdrom(devtag_get_device(space->machine, SOUND, "cdda"), akiko.cdrom); + if ( akiko.cdrom != NULL ) cdda_set_cdrom(devtag_get_device(space->machine, "cdda"), akiko.cdrom); return 0x0000cafe; case 0x04/4: /* CDROM STATUS 1 */ diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index be34a849b10..852ba146ffb 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -763,8 +763,8 @@ WRITE64_HANDLER( dc_g1_ctrl_w ) mame_printf_verbose("G1CTRL: unsupported transfer\n"); return; } - ROM = (UINT8 *)devtag_get_info_ptr(space->machine, NAOMI_BOARD, "rom_board", DEVINFO_PTR_MEMORY); - dmaoffset = (UINT32)devtag_get_info_int(space->machine, NAOMI_BOARD, "rom_board", DEVINFO_INT_DMAOFFSET); + ROM = (UINT8 *)devtag_get_info_ptr(space->machine, "rom_board", DEVINFO_PTR_MEMORY); + dmaoffset = (UINT32)devtag_get_info_int(space->machine, "rom_board", DEVINFO_INT_DMAOFFSET); ddtdata.destination=g1bus_regs[SB_GDSTAR]; // destination address ddtdata.length=g1bus_regs[SB_GDLEN] >> 5; // words to transfer ddtdata.size=32; // bytes per word diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index 9f0d107434a..e4284461529 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -1340,7 +1340,7 @@ void decocass_machine_state_save_init(running_machine *machine) MACHINE_START( decocass ) { - cassette_device = devtag_get_device(machine, DECOCASS_TAPE, "cassette"); + cassette_device = devtag_get_device(machine, "cassette"); } static void decocass_reset_common(running_machine *machine) diff --git a/src/mame/machine/gaplus.c b/src/mame/machine/gaplus.c index c7871339458..d251fa651aa 100644 --- a/src/mame/machine/gaplus.c +++ b/src/mame/machine/gaplus.c @@ -22,7 +22,7 @@ UINT8 *gaplus_customio_3; WRITE8_HANDLER( gaplus_customio_3_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); if ((offset == 0x09) && (data >= 0x0f)) sample_start(samples,0,0,0); gaplus_customio_3[offset] = data; diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 5e6acf43f63..6d81078e7c4 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -378,7 +378,7 @@ MACHINE_RESET( leland ) /* reset globals */ leland_gfx_control = 0x00; - leland_sound_port_w(devtag_get_device(machine, SOUND, "ay8910.1"), 0, 0xff); + leland_sound_port_w(devtag_get_device(machine, "ay8910.1"), 0, 0xff); wcol_enable = 0; dangerz_x = 512; @@ -1169,7 +1169,7 @@ READ8_HANDLER( leland_master_input_r ) case 0x03: /* /IGID */ case 0x13: - result = ay8910_r(devtag_get_device(space->machine, SOUND, "ay8910.1"), offset); + result = ay8910_r(devtag_get_device(space->machine, "ay8910.1"), offset); break; case 0x10: /* /GIN0 */ @@ -1209,7 +1209,7 @@ WRITE8_HANDLER( leland_master_output_w ) case 0x0a: /* /OGIA */ case 0x0b: /* /OGID */ - ay8910_address_data_w(devtag_get_device(space->machine, SOUND, "ay8910.1"), offset, data); + ay8910_address_data_w(devtag_get_device(space->machine, "ay8910.1"), offset, data); break; case 0x0c: /* /BKXL */ diff --git a/src/mame/machine/mathbox.h b/src/mame/machine/mathbox.h index 7082a21b467..8642c06d9a6 100644 --- a/src/mame/machine/mathbox.h +++ b/src/mame/machine/mathbox.h @@ -14,7 +14,7 @@ MDRV_DEVICE_ADD(_tag, MATHBOX, 0) #define MDRV_MATHBOX_REMOVE(_tag) \ - MDRV_DEVICE_REMOVE(_tag, MATHBOX) + MDRV_DEVICE_REMOVE(_tag) diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c index e42c0cfd9b5..1f7eafc7761 100644 --- a/src/mame/machine/mcr.c +++ b/src/mame/machine/mcr.c @@ -230,17 +230,17 @@ static void ipu_ctc_interrupt(const device_config *device, int state) const z80_daisy_chain mcr_daisy_chain[] = { - { Z80CTC, "ctc" }, + { "ctc" }, { NULL } }; const z80_daisy_chain mcr_ipu_daisy_chain[] = { - { Z80CTC, "ipu_ctc" }, - { Z80PIO, "ipu_pio1" }, - { Z80SIO, "ipu_sio" }, - { Z80PIO, "ipu_pio0" }, + { "ipu_ctc" }, + { "ipu_pio1" }, + { "ipu_sio" }, + { "ipu_pio0" }, { NULL } }; @@ -426,7 +426,7 @@ MACHINE_RESET( zwackery ) INTERRUPT_GEN( mcr_interrupt ) { - const device_config *ctc = devtag_get_device(device->machine, Z80CTC, "ctc"); + const device_config *ctc = devtag_get_device(device->machine, "ctc"); /* CTC line 2 is connected to VBLANK, which is once every 1/2 frame */ /* for the 30Hz interlaced display */ @@ -445,7 +445,7 @@ INTERRUPT_GEN( mcr_interrupt ) INTERRUPT_GEN( mcr_ipu_interrupt ) { - const device_config *ctc = devtag_get_device(device->machine, Z80CTC, "ipu_ctc"); + const device_config *ctc = devtag_get_device(device->machine, "ipu_ctc"); /* CTC line 3 is connected to 493, which is signalled once every */ /* frame at 30Hz */ @@ -612,14 +612,14 @@ static WRITE_LINE_DEVICE_HANDLER( zwackery_pia_irq ) static TIMER_CALLBACK( zwackery_493_off_callback ) { - const device_config *pia = devtag_get_device(machine, PIA6821, "pia0"); + const device_config *pia = devtag_get_device(machine, "pia0"); pia_ca1_w(pia, 0, 0); } static TIMER_CALLBACK( zwackery_493_callback ) { - const device_config *pia = devtag_get_device(machine, PIA6821, "pia0"); + const device_config *pia = devtag_get_device(machine, "pia0"); pia_ca1_w(pia, 0, 1); timer_set(machine, video_screen_get_scan_period(machine->primary_screen), NULL, 0, zwackery_493_off_callback); @@ -976,10 +976,10 @@ static TIMER_CALLBACK( ipu_watchdog_reset ) { logerror("ipu_watchdog_reset\n"); cputag_set_input_line(machine, "ipu", INPUT_LINE_RESET, PULSE_LINE); - devtag_reset(machine, Z80CTC, "ipu_ctc"); - devtag_reset(machine, Z80PIO, "ipu_pio0"); - devtag_reset(machine, Z80PIO, "ipu_pio1"); - devtag_reset(machine, Z80SIO, "ipu_sio"); + devtag_reset(machine, "ipu_ctc"); + devtag_reset(machine, "ipu_pio0"); + devtag_reset(machine, "ipu_pio1"); + devtag_reset(machine, "ipu_sio"); } diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c index cb79cb5d141..f6813cf2872 100644 --- a/src/mame/machine/mhavoc.c +++ b/src/mame/machine/mhavoc.c @@ -222,7 +222,7 @@ WRITE8_HANDLER( mhavoc_rom_banksel_w ) CUSTOM_INPUT( tms5220_r ) { - return tms5220_ready_r(devtag_get_device(field->port->machine, SOUND, "tms")) ? 0 : 1; + return tms5220_ready_r(devtag_get_device(field->port->machine, "tms")) ? 0 : 1; } CUSTOM_INPUT( mhavoc_bit67_r ) @@ -327,7 +327,7 @@ static WRITE8_HANDLER( mhavocrv_speech_data_w ) static WRITE8_HANDLER( mhavocrv_speech_strobe_w ) { - const device_config *tms = devtag_get_device(space->machine, SOUND, "tms"); + const device_config *tms = devtag_get_device(space->machine, "tms"); tms5220_data_w(tms, 0, speech_write_buffer); } diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index 586fa69e65c..0add6a4fa0c 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -812,8 +812,8 @@ static void start_audio_dma(running_machine *machine) // mame_printf_debug("DACDMA: %x for %x bytes\n", current->address, current->length); - dmadac[0] = devtag_get_device(machine, SOUND, "dac1"); - dmadac[1] = devtag_get_device(machine, SOUND, "dac2"); + dmadac[0] = devtag_get_device(machine, "dac1"); + dmadac[1] = devtag_get_device(machine, "dac2"); dmadac_transfer(&dmadac[0], 2, 2, 2, current->length/4, ram); ai_status |= 0x40000000; diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c index c3be67294a8..0d2e42a2c34 100644 --- a/src/mame/machine/namcoio.c +++ b/src/mame/machine/namcoio.c @@ -931,7 +931,7 @@ static void namco_06xx_data_write(running_machine *machine,int chipnum,UINT8 dat case NAMCOIO_50XX: namco_50xx_write(machine, data); break; case NAMCOIO_50XX_2: namco_50xx_2_write(machine, data); break; case NAMCOIO_51XX: namcoio_51XX_write(machine,chipnum,data); break; - case NAMCOIO_52XX: namcoio_52xx_write(devtag_get_device(machine, SOUND, "namco52"), data); break; + case NAMCOIO_52XX: namcoio_52xx_write(devtag_get_device(machine, "namco52"), data); break; case NAMCOIO_54XX: namco_54xx_write(machine, data); break; default: logerror("%s: custom IO type %d unsupported write\n",cpuexec_describe_context(machine),io[chipnum].type); diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index 87eaca9e766..91f8f127650 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -627,7 +627,7 @@ static READ8_HANDLER( soundram_r ) offset &= 0x3ff; /* CUS 30 */ - return namcos1_cus30_r(devtag_get_device(space->machine, SOUND, "namco"),offset); + return namcos1_cus30_r(devtag_get_device(space->machine, "namco"),offset); } else { @@ -645,7 +645,7 @@ static WRITE8_HANDLER( soundram_w ) offset &= 0x3ff; /* CUS 30 */ - namcos1_cus30_w(devtag_get_device(space->machine, SOUND, "namco"),offset,data); + namcos1_cus30_w(devtag_get_device(space->machine, "namco"),offset,data); } else { diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c index 96eabc4e015..d28abcb4873 100644 --- a/src/mame/machine/nitedrvr.c +++ b/src/mame/machine/nitedrvr.c @@ -211,7 +211,7 @@ D5 = SKID2 ***************************************************************************/ WRITE8_HANDLER( nitedrvr_out0_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); discrete_sound_w(discrete, NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data discrete_sound_w(discrete, NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable discrete_sound_w(discrete, NITEDRVR_SKID2_EN, data & 0x20); // Skid2 enable @@ -229,7 +229,7 @@ D5 = Spare (Not used) ***************************************************************************/ WRITE8_HANDLER( nitedrvr_out1_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); set_led_status(0,data & 0x10); @@ -254,7 +254,7 @@ static TIMER_CALLBACK( nitedrvr_crash_toggle_callback ) { if (nitedrvr_crash_en && nitedrvr_crash_data_en) { - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); nitedrvr_crash_data--; discrete_sound_w(discrete, NITEDRVR_BANG_DATA, nitedrvr_crash_data); // Crash Volume diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c index 8357a648ae3..d3f6c1fab8e 100644 --- a/src/mame/machine/nmk004.c +++ b/src/mame/machine/nmk004.c @@ -1021,9 +1021,9 @@ static TIMER_CALLBACK( real_nmk004_init ) memset(&NMK004_state, 0, sizeof(NMK004_state)); NMK004_state.machine = machine; - NMK004_state.ymdevice = devtag_get_device(machine, SOUND, "ym"); - NMK004_state.oki1device = devtag_get_device(machine, SOUND, "oki1"); - NMK004_state.oki2device = devtag_get_device(machine, SOUND, "oki2"); + NMK004_state.ymdevice = devtag_get_device(machine, "ym"); + NMK004_state.oki1device = devtag_get_device(machine, "oki1"); + NMK004_state.oki2device = devtag_get_device(machine, "oki2"); NMK004_state.rom = memory_region(machine, "audiocpu"); diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c index ab721f65233..7b2c66f67b6 100644 --- a/src/mame/machine/qix.c +++ b/src/mame/machine/qix.c @@ -252,7 +252,7 @@ MACHINE_START( qixmcu ) MC6845_ON_VSYNC_CHANGED( qix_vsync_changed ) { - const device_config *pia = devtag_get_device(device->machine, PIA6821, "sndpia0"); + const device_config *pia = devtag_get_device(device->machine, "sndpia0"); pia_cb1_w(pia, 0, vsync); } @@ -508,7 +508,7 @@ static WRITE8_DEVICE_HANDLER( qix_coinctl_w ) static WRITE8_DEVICE_HANDLER( slither_76489_0_w ) { /* write to the sound chip */ - sn76496_w(devtag_get_device(device->machine, SOUND, "sn1"), 0, data); + sn76496_w(devtag_get_device(device->machine, "sn1"), 0, data); /* clock the ready line going back into CB1 */ pia_cb1_w(device, 0, 0); @@ -519,7 +519,7 @@ static WRITE8_DEVICE_HANDLER( slither_76489_0_w ) static WRITE8_DEVICE_HANDLER( slither_76489_1_w ) { /* write to the sound chip */ - sn76496_w(devtag_get_device(device->machine, SOUND, "sn2"), 0, data); + sn76496_w(devtag_get_device(device->machine, "sn2"), 0, data); /* clock the ready line going back into CB1 */ pia_cb1_w(device, 0, 0); diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index 20f9a892a9c..1f9fa92f8a0 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -146,9 +146,9 @@ static READ8_HANDLER( cavelon_banksw_r ) cavelon_banksw(space->machine); if ((offset >= 0x0100) && (offset <= 0x0103)) - return ppi8255_r((device_config*)devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset - 0x0100); + return ppi8255_r((device_config*)devtag_get_device(space->machine, "ppi8255_0"), offset - 0x0100); else if ((offset >= 0x0200) && (offset <= 0x0203)) - return ppi8255_r((device_config*)devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset - 0x0200); + return ppi8255_r((device_config*)devtag_get_device(space->machine, "ppi8255_1"), offset - 0x0200); return 0xff; } @@ -158,9 +158,9 @@ static WRITE8_HANDLER( cavelon_banksw_w ) cavelon_banksw(space->machine); if ((offset >= 0x0100) && (offset <= 0x0103)) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_0"), offset - 0x0100, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_0"), offset - 0x0100, data); else if ((offset >= 0x0200) && (offset <= 0x0203)) - ppi8255_w(devtag_get_device(space->machine, PPI8255, "ppi8255_1"), offset - 0x0200, data); + ppi8255_w(devtag_get_device(space->machine, "ppi8255_1"), offset - 0x0200, data); } diff --git a/src/mame/machine/stvcd.c b/src/mame/machine/stvcd.c index 03f39a36dc9..8c5dd61bf3b 100644 --- a/src/mame/machine/stvcd.c +++ b/src/mame/machine/stvcd.c @@ -259,7 +259,7 @@ void stvcd_reset(running_machine *machine) } #ifdef MESS - cdrom = mess_cd_get_cdrom_file(device_list_find_by_tag( machine->config->devicelist, CDROM, "cdrom" )); + cdrom = mess_cd_get_cdrom_file(devtag_get_device( machine, "cdrom" )); #else cdrom = cdrom_open(get_disk_handle("cdrom")); #endif diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c index 1536f8fced4..0feec56bfca 100644 --- a/src/mame/machine/toaplan1.c +++ b/src/mame/machine/toaplan1.c @@ -232,7 +232,7 @@ WRITE16_HANDLER( toaplan1_reset_sound ) if (ACCESSING_BITS_0_7 && (data == 0)) { logerror("PC:%04x Resetting Sound CPU and Sound chip (%08x)\n",cpu_get_previouspc(space->cpu),data); - devtag_reset(space->machine, SOUND, "ym"); + devtag_reset(space->machine, "ym"); if (space->machine->cpu[1] != NULL && cpu_get_type(space->machine->cpu[1]) == CPU_Z80) cpu_set_input_line(space->machine->cpu[1], INPUT_LINE_RESET, PULSE_LINE); } diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c index 4dcc4365564..80065f9caa0 100644 --- a/src/mame/machine/williams.c +++ b/src/mame/machine/williams.c @@ -126,7 +126,7 @@ const pia6821_interface williams_pia_1_intf = const pia6821_interface williams_snd_pia_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER(SOUND, "wmsdac", dac_w), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, + /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER("wmsdac", dac_w), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, /*irqs : A/B */ DEVCB_LINE(williams_snd_irq), DEVCB_LINE(williams_snd_irq) }; @@ -150,7 +150,7 @@ const pia6821_interface lottofun_pia_0_intf = const pia6821_interface sinistar_snd_pia_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER(SOUND, "wmsdac", dac_w), DEVCB_NULL, DEVCB_DEVICE_LINE(SOUND, "cvsd", hc55516_digit_w), DEVCB_DEVICE_LINE(SOUND, "cvsd", hc55516_clock_w), + /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER("wmsdac", dac_w), DEVCB_NULL, DEVCB_DEVICE_LINE("cvsd", hc55516_digit_w), DEVCB_DEVICE_LINE("cvsd", hc55516_clock_w), /*irqs : A/B */ DEVCB_LINE(williams_snd_irq), DEVCB_LINE(williams_snd_irq) }; @@ -190,7 +190,7 @@ const pia6821_interface williams2_muxed_pia_0_intf = const pia6821_interface williams2_pia_1_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_HANDLER(input_port_2_device_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(williams2_snd_cmd_w), DEVCB_NULL, DEVCB_DEVICE_HANDLER(PIA6821, "pia_2", pia_ca1_w), + /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(williams2_snd_cmd_w), DEVCB_NULL, DEVCB_DEVICE_HANDLER("pia_2", pia_ca1_w), /*irqs : A/B */ DEVCB_LINE(williams_main_irq), DEVCB_LINE(williams_main_irq) }; @@ -198,7 +198,7 @@ const pia6821_interface williams2_pia_1_intf = const pia6821_interface williams2_snd_pia_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER(PIA6821, "pia_1", pia_portb_w), DEVCB_DEVICE_HANDLER(SOUND, "wmsdac", dac_w), DEVCB_DEVICE_HANDLER(PIA6821, "pia_1", pia_cb1_w), DEVCB_NULL, + /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER("pia_1", pia_portb_w), DEVCB_DEVICE_HANDLER("wmsdac", dac_w), DEVCB_DEVICE_HANDLER("pia_1", pia_cb1_w), DEVCB_NULL, /*irqs : A/B */ DEVCB_LINE(williams_snd_irq), DEVCB_LINE(williams_snd_irq) }; @@ -222,7 +222,7 @@ const pia6821_interface mysticm_pia_0_intf = const pia6821_interface mysticm_pia_1_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_HANDLER(input_port_2_device_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(williams2_snd_cmd_w), DEVCB_NULL, DEVCB_DEVICE_HANDLER(PIA6821, "pia_2", pia_ca1_w), + /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(williams2_snd_cmd_w), DEVCB_NULL, DEVCB_DEVICE_HANDLER("pia_2", pia_ca1_w), /*irqs : A/B */ DEVCB_LINE(mysticm_main_irq), DEVCB_LINE(mysticm_main_irq) }; @@ -238,7 +238,7 @@ const pia6821_interface tshoot_pia_0_intf = const pia6821_interface tshoot_pia_1_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_HANDLER(input_port_2_device_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(williams2_snd_cmd_w), DEVCB_NULL, DEVCB_DEVICE_HANDLER(PIA6821, "pia_2", pia_ca1_w), + /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(williams2_snd_cmd_w), DEVCB_NULL, DEVCB_DEVICE_HANDLER("pia_2", pia_ca1_w), /*irqs : A/B */ DEVCB_LINE(tshoot_main_irq), DEVCB_LINE(tshoot_main_irq) }; @@ -246,7 +246,7 @@ const pia6821_interface tshoot_pia_1_intf = const pia6821_interface tshoot_snd_pia_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER(PIA6821, "pia_1", pia_portb_w), DEVCB_DEVICE_HANDLER(SOUND, "wmsdac", dac_w), DEVCB_DEVICE_HANDLER(PIA6821, "pia_1", pia_cb1_w), DEVCB_HANDLER(tshoot_maxvol_w), + /*outputs: A/B,CA/B2 */ DEVCB_DEVICE_HANDLER("pia_1", pia_portb_w), DEVCB_DEVICE_HANDLER("wmsdac", dac_w), DEVCB_DEVICE_HANDLER("pia_1", pia_cb1_w), DEVCB_HANDLER(tshoot_maxvol_w), /*irqs : A/B */ DEVCB_LINE(williams_snd_irq), DEVCB_LINE(williams_snd_irq) }; @@ -254,7 +254,7 @@ const pia6821_interface tshoot_snd_pia_intf = const pia6821_interface joust2_pia_1_intf = { /*inputs : A/B,CA/B1,CA/B2 */ DEVCB_HANDLER(input_port_2_device_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(joust2_snd_cmd_w), DEVCB_HANDLER(joust2_pia_3_cb1_w), DEVCB_DEVICE_HANDLER(PIA6821, "pia_2", pia_ca1_w), + /*outputs: A/B,CA/B2 */ DEVCB_NULL, DEVCB_HANDLER(joust2_snd_cmd_w), DEVCB_HANDLER(joust2_pia_3_cb1_w), DEVCB_DEVICE_HANDLER("pia_2", pia_ca1_w), /*irqs : A/B */ DEVCB_LINE(williams_main_irq), DEVCB_LINE(williams_main_irq) }; @@ -273,7 +273,7 @@ const pia6821_interface joust2_pia_3_intf = static TIMER_CALLBACK( williams_va11_callback ) { - const device_config *pia_1 = devtag_get_device(machine, PIA6821, "pia_1"); + const device_config *pia_1 = devtag_get_device(machine, "pia_1"); int scanline = param; /* the IRQ signal comes into CB1, and is set to VA11 */ @@ -288,7 +288,7 @@ static TIMER_CALLBACK( williams_va11_callback ) static TIMER_CALLBACK( williams_count240_off_callback ) { - const device_config *pia_1 = devtag_get_device(machine, PIA6821, "pia_1"); + const device_config *pia_1 = devtag_get_device(machine, "pia_1"); /* the COUNT240 signal comes into CA1, and is set to the logical AND of VA10-VA13 */ pia_ca1_w(pia_1, 0, 0); @@ -297,7 +297,7 @@ static TIMER_CALLBACK( williams_count240_off_callback ) static TIMER_CALLBACK( williams_count240_callback ) { - const device_config *pia_1 = devtag_get_device(machine, PIA6821, "pia_1"); + const device_config *pia_1 = devtag_get_device(machine, "pia_1"); /* the COUNT240 signal comes into CA1, and is set to the logical AND of VA10-VA13 */ pia_ca1_w(pia_1, 0, 1); @@ -312,7 +312,7 @@ static TIMER_CALLBACK( williams_count240_callback ) static void williams_main_irq(const device_config *device, int state) { - const device_config *pia_1 = devtag_get_device(device->machine, PIA6821, "pia_1"); + const device_config *pia_1 = devtag_get_device(device->machine, "pia_1"); int combined_state = pianew_get_irq_a(pia_1) | pianew_get_irq_b(pia_1); /* IRQ to the main CPU */ @@ -329,7 +329,7 @@ static void williams_main_firq(const device_config *device, int state) static void williams_snd_irq(const device_config *device, int state) { - const device_config *pia_2 = devtag_get_device(device->machine, PIA6821, "pia_2"); + const device_config *pia_2 = devtag_get_device(device->machine, "pia_2"); int combined_state = pianew_get_irq_a(pia_2) | pianew_get_irq_b(pia_2); /* IRQ to the sound CPU */ @@ -346,8 +346,8 @@ static void williams_snd_irq(const device_config *device, int state) static void mysticm_main_irq(const device_config *device, int state) { - const device_config *pia_0 = devtag_get_device(device->machine, PIA6821, "pia_0"); - const device_config *pia_1 = devtag_get_device(device->machine, PIA6821, "pia_1"); + const device_config *pia_0 = devtag_get_device(device->machine, "pia_0"); + const device_config *pia_1 = devtag_get_device(device->machine, "pia_1"); int combined_state = pianew_get_irq_b(pia_0) | pianew_get_irq_a(pia_1) | pianew_get_irq_b(pia_1); /* IRQ to the main CPU */ @@ -357,8 +357,8 @@ static void mysticm_main_irq(const device_config *device, int state) static void tshoot_main_irq(const device_config *device, int state) { - const device_config *pia_0 = devtag_get_device(device->machine, PIA6821, "pia_0"); - const device_config *pia_1 = devtag_get_device(device->machine, PIA6821, "pia_1"); + const device_config *pia_0 = devtag_get_device(device->machine, "pia_0"); + const device_config *pia_1 = devtag_get_device(device->machine, "pia_1"); int combined_state = pianew_get_irq_a(pia_0) | pianew_get_irq_b(pia_0) | pianew_get_irq_a(pia_1) | pianew_get_irq_b(pia_1); /* IRQ to the main CPU */ @@ -409,8 +409,8 @@ MACHINE_RESET( williams ) static TIMER_CALLBACK( williams2_va11_callback ) { - const device_config *pia_0 = devtag_get_device(machine, PIA6821, "pia_0"); - const device_config *pia_1 = devtag_get_device(machine, PIA6821, "pia_1"); + const device_config *pia_0 = devtag_get_device(machine, "pia_0"); + const device_config *pia_1 = devtag_get_device(machine, "pia_1"); int scanline = param; /* the IRQ signal comes into CB1, and is set to VA11 */ @@ -426,7 +426,7 @@ static TIMER_CALLBACK( williams2_va11_callback ) static TIMER_CALLBACK( williams2_endscreen_off_callback ) { - const device_config *pia_0 = devtag_get_device(machine, PIA6821, "pia_0"); + const device_config *pia_0 = devtag_get_device(machine, "pia_0"); /* the /ENDSCREEN signal comes into CA1 */ pia_ca1_w(pia_0, 0, 1); @@ -435,7 +435,7 @@ static TIMER_CALLBACK( williams2_endscreen_off_callback ) static TIMER_CALLBACK( williams2_endscreen_callback ) { - const device_config *pia_0 = devtag_get_device(machine, PIA6821, "pia_0"); + const device_config *pia_0 = devtag_get_device(machine, "pia_0"); /* the /ENDSCREEN signal comes into CA1 */ pia_ca1_w(pia_0, 0, 0); @@ -547,7 +547,7 @@ WRITE8_HANDLER( williams2_bank_select_w ) static TIMER_CALLBACK( williams_deferred_snd_cmd_w ) { - const device_config *pia_2 = devtag_get_device(machine, PIA6821, "pia_2"); + const device_config *pia_2 = devtag_get_device(machine, "pia_2"); pia_portb_w(pia_2, 0, param); pia_cb1_w(pia_2, 0, (param == 0xff) ? 0 : 1); @@ -567,7 +567,7 @@ WRITE8_DEVICE_HANDLER( playball_snd_cmd_w ) static TIMER_CALLBACK( williams2_deferred_snd_cmd_w ) { - const device_config *pia_2 = devtag_get_device(machine, PIA6821, "pia_2"); + const device_config *pia_2 = devtag_get_device(machine, "pia_2"); pia_porta_w(pia_2, 0, param); } @@ -962,7 +962,7 @@ MACHINE_START( joust2 ) MACHINE_RESET( joust2 ) { - const device_config *pia_3 = devtag_get_device(machine, PIA6821, "pia_3"); + const device_config *pia_3 = devtag_get_device(machine, "pia_3"); /* standard init */ MACHINE_RESET_CALL(williams2); @@ -973,14 +973,14 @@ MACHINE_RESET( joust2 ) static TIMER_CALLBACK( joust2_deferred_snd_cmd_w ) { - const device_config *pia_2 = devtag_get_device(machine, PIA6821, "pia_2"); + const device_config *pia_2 = devtag_get_device(machine, "pia_2"); pia_porta_w(pia_2, 0, param & 0xff); } static WRITE8_DEVICE_HANDLER( joust2_pia_3_cb1_w ) { - const device_config *pia_3 = devtag_get_device(device->machine, PIA6821, "pia_3"); + const device_config *pia_3 = devtag_get_device(device->machine, "pia_3"); joust2_current_sound_data = (joust2_current_sound_data & ~0x100) | ((data << 8) & 0x100); pia_cb1_w(pia_3, offset, data); diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c index 1746afda9c2..25c69e3c13b 100644 --- a/src/mame/machine/xevious.c +++ b/src/mame/machine/xevious.c @@ -154,7 +154,7 @@ WRITE8_HANDLER( battles_noise_sound_w ) { logerror("CPU3 %04x: 50%02x Write = %02x\n",cpu_get_pc(space->cpu),offset,data); if( (battles_sound_played == 0) && (data == 0xFF) ){ - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); if( customio[0] == 0x40 ){ sample_start (samples, 0, 0, 0); } diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c index 8c6f934f07c..5aca81b2a14 100644 --- a/src/mame/video/astrocde.c +++ b/src/mame/video/astrocde.c @@ -646,7 +646,7 @@ WRITE8_HANDLER( astrocade_data_chip_register_w ) case 0x17: /* noise volume register */ case 0x18: /* sound block transfer */ if (astrocade_video_config & AC_SOUND_PRESENT) - astrocade_sound_w(devtag_get_device(space->machine, SOUND, "astrocade1"), offset, data); + astrocade_sound_w(devtag_get_device(space->machine, "astrocade1"), offset, data); break; case 0x19: /* expand register */ diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c index 64b67fef2c7..25bed89aadf 100644 --- a/src/mame/video/beezer.c +++ b/src/mame/video/beezer.c @@ -7,7 +7,7 @@ static int scanline=0; INTERRUPT_GEN( beezer_interrupt ) { - const device_config *via_0 = device_list_find_by_tag(device->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via_0 = devtag_get_device(device->machine, "via6522_0"); scanline = (scanline + 1) % 0x80; via_ca2_w (via_0, 0, scanline & 0x10); diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 8660095913a..b9e3aeb237d 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -50,7 +50,7 @@ WRITE8_HANDLER( cheekyms_port_40_w ) { /* the lower bits probably trigger sound samples */ - dac_data_w(devtag_get_device(space->machine, SOUND, "dac"), data ? 0x80 : 0); + dac_data_w(devtag_get_device(space->machine, "dac"), data ? 0x80 : 0); } diff --git a/src/mame/video/cidelsa.c b/src/mame/video/cidelsa.c index 55f6c7ab12b..41252ba6e49 100644 --- a/src/mame/video/cidelsa.c +++ b/src/mame/video/cidelsa.c @@ -197,7 +197,7 @@ static void video_start(running_machine *machine, UINT16 pageram_size) state->charram = auto_malloc(CIDELSA_CHARRAM_SIZE); /* find devices */ - state->cdp1869 = devtag_get_device(machine, SOUND, CDP1869_TAG); + state->cdp1869 = devtag_get_device(machine, CDP1869_TAG); /* register for state saving */ state_save_register_global(machine, state->cdp1869_prd); diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index d85ef6214ba..35928b57bba 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -354,9 +354,9 @@ static void update_one_screen(const device_config *screen, bitmap_t *bitmap, con rectangle *visarea = (rectangle *)video_screen_get_visible_area(screen); /* for 2p games, the left screen is the main screen */ - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); if (left_screen == NULL) - left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "screen"); + left_screen = devtag_get_device(screen->machine, "screen"); /* draw the playfield */ tilemap_draw(bitmap, cliprect, (screen == left_screen) ? atarigen_playfield_tilemap : atarigen_playfield2_tilemap, 0, 0); diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index ff1c677c88c..605283f0197 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -120,9 +120,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( darius ) { int xoffs = 0; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *middle_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "mscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *middle_screen = devtag_get_device(screen->machine, "mscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) xoffs = 36*8*0; diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 1d2cd06914f..8a96be68d2a 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -297,7 +297,7 @@ WRITE8_HANDLER( dday_control_w ) /* bit 4 is sound enable */ if (!(data & 0x10) && (control & 0x10)) - devtag_reset(space->machine, SOUND, "ay"); + devtag_reset(space->machine, "ay"); sound_global_enable(data & 0x10); diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index fd0a059ff58..1bf2c3ce8f7 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -714,8 +714,8 @@ INLINE double CD4049(running_machine *machine, double x) static void radarscp_step(running_machine *machine, int line_cnt) { dkong_state *state = machine->driver_data; - const device_config *dev6h = devtag_get_device(machine, LATCH8, "ls259.6h"); - const device_config *devvp2 = devtag_get_device(machine, LATCH8, "virtual_p2"); + const device_config *dev6h = devtag_get_device(machine, "ls259.6h"); + const device_config *devvp2 = devtag_get_device(machine, "virtual_p2"); /* Condensator is illegible in schematics for TRS2 board. * TRS1 board states 3.3u. diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 905d30c91d1..0b033d14b94 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -1206,8 +1206,8 @@ VIDEO_UPDATE( jantouki ) { int layers_ctrl = dynax_layer_enable; - const device_config *top_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "top"); - const device_config *bottom_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "bottom"); + const device_config *top_screen = devtag_get_device(screen->machine, "top"); + const device_config *bottom_screen = devtag_get_device(screen->machine, "bottom"); if (debug_viewer(screen->machine,bitmap,cliprect)) return 0; layers_ctrl &= debug_mask(); diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index af454135a70..b12ec804850 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -468,8 +468,8 @@ VIDEO_UPDATE( fromanc2 ) int *scrolly = NULL; tilemap **tilemaps = NULL; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 8f23d88f55b..f6ca3caf002 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -468,8 +468,8 @@ VIDEO_UPDATE( gaelco2_dual ) { int i; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); /* read scroll values */ int scroll0x = gaelco2_videoram[0x2802/2] + 0x14; diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index 8dfdfd911d6..aada6291769 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -142,7 +142,7 @@ static WRITE8_DEVICE_HANDLER( leprechn_video_command_w ) static TIMER_CALLBACK( clear_screen_done_callback ) { - const device_config *via = device_list_find_by_tag(machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via = devtag_get_device(machine, "via6522_0"); /* indicate that the we are done clearing the screen */ via_ca1_w(via, 0, 0); @@ -195,7 +195,7 @@ static WRITE8_DEVICE_HANDLER( video_command_trigger_w ) case 3: /* indicate that the we are busy */ { - const device_config *via = device_list_find_by_tag(device->machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via = devtag_get_device(device->machine, "via6522_0"); via_ca1_w(via, 0, 1); } @@ -267,7 +267,7 @@ const via6522_interface trvquest_via_0_interface = static TIMER_CALLBACK( via_0_ca1_timer_callback ) { gameplan_state *state = machine->driver_data; - const device_config *via = device_list_find_by_tag(machine->config->devicelist, VIA6522, "via6522_0"); + const device_config *via = devtag_get_device(machine, "via6522_0"); /* !VBLANK is connected to CA1 */ via_ca1_w(via, 0, (UINT8)param); diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c index ee5c062a86e..6296b7e55b0 100644 --- a/src/mame/video/genesis.c +++ b/src/mame/video/genesis.c @@ -394,7 +394,7 @@ WRITE16_HANDLER( genesis_vdp_w ) case 0x09: case 0x0a: case 0x0b: - device = devtag_get_device(space->machine, SOUND, "sn"); + device = devtag_get_device(space->machine, "sn"); if (device != NULL && ACCESSING_BITS_0_7) sn76496_w(device, 0, data & 0xff); break; diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index 2993e8cf6cd..9c52266cc15 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -152,7 +152,7 @@ static int paletteram_bank; WRITE8_HANDLER( pang_gfxctrl_w ) { - const device_config *oki = devtag_get_device(space->machine, SOUND, "oki"); + const device_config *oki = devtag_get_device(space->machine, "oki"); logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); { #if 0 @@ -212,7 +212,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); /* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */ /* bit 4 selects OKI M6295 bank */ -// okim6295_set_bank_base(devtag_get_device(space->machine, SOUND, "oki"), (data & 0x10) ? 0x40000 : 0x00000); +// okim6295_set_bank_base(devtag_get_device(space->machine, "oki"), (data & 0x10) ? 0x40000 : 0x00000); /* not here.. it has its own z80 + sound banking */ /* bit 5 is palette RAM bank selector (doesn't apply to mgakuen) */ diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c index a80d598a7d7..38b9d4364e3 100644 --- a/src/mame/video/nbmj8688.c +++ b/src/mame/video/nbmj8688.c @@ -718,9 +718,9 @@ VIDEO_UPDATE( mbmj8688_LCD ) { int x, y, b; - const device_config *main_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "screen"); - const device_config *lcd0_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lcd0"); - const device_config *lcd1_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lcd1"); + const device_config *main_screen = devtag_get_device(screen->machine, "screen"); + const device_config *lcd0_screen = devtag_get_device(screen->machine, "lcd0"); + const device_config *lcd1_screen = devtag_get_device(screen->machine, "lcd1"); if (screen == main_screen) VIDEO_UPDATE_CALL(mbmj8688); diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index 98264a457ec..eab61e514a5 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -152,9 +152,9 @@ VIDEO_UPDATE( ninjaw ) int xoffs = 0, screen_number = -1; UINT8 layer[3], nodraw; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *middle_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "mscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *middle_screen = devtag_get_device(screen->machine, "mscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index 8033efc00b8..f6a291c776e 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -133,7 +133,7 @@ VIDEO_UPDATE( playch10 ) /* Dual monitor version */ if (pc10_bios == 1) { - const device_config *top_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "top"); + const device_config *top_screen = devtag_get_device(screen->machine, "top"); /* On Playchoice 10 single monitor, this bit toggles */ /* between PPU and BIOS display. */ diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index 4c102e8b20b..d32925de32f 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -125,8 +125,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( psikyo4 ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index 759dd5267e5..de61e6b74e5 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -370,8 +370,8 @@ static void punchout_copy_bot_palette(running_machine *machine, int bank) VIDEO_UPDATE( punchout ) { - const device_config *top_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "top"); - const device_config *bottom_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "bottom"); + const device_config *top_screen = devtag_get_device(screen->machine, "top"); + const device_config *bottom_screen = devtag_get_device(screen->machine, "bottom"); if (screen == top_screen) { @@ -404,8 +404,8 @@ VIDEO_UPDATE( punchout ) VIDEO_UPDATE( armwrest ) { - const device_config *top_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "top"); - const device_config *bottom_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "bottom"); + const device_config *top_screen = devtag_get_device(screen->machine, "top"); + const device_config *bottom_screen = devtag_get_device(screen->machine, "bottom"); if (screen == top_screen) { diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index d5b6e35f02f..0d85e055ea3 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -350,7 +350,7 @@ static MC6845_UPDATE_ROW( update_row ) static VIDEO_UPDATE( qix ) { - const device_config *mc6845 = device_list_find_by_tag(screen->machine->config->devicelist, MC6845, MC6845_TAG); + const device_config *mc6845 = devtag_get_device(screen->machine, MC6845_TAG); mc6845_update(mc6845, bitmap, cliprect); return 0; @@ -375,8 +375,8 @@ static ADDRESS_MAP_START( qix_video_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, qix_addresslatch_w) 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(0x9c00, 0x9c00) AM_MIRROR(0x03fe) AM_DEVWRITE("vid_u18", mc6845_address_w) + AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE("vid_u18", mc6845_register_r, mc6845_register_w) AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -393,8 +393,8 @@ static ADDRESS_MAP_START( zookeep_video_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, qix_addresslatch_w) 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(0x9c00, 0x9c00) AM_MIRROR(0x03fe) AM_DEVWRITE("vid_u18", mc6845_address_w) + AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE("vid_u18", mc6845_register_r, mc6845_register_w) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -412,8 +412,8 @@ static ADDRESS_MAP_START( slither_video_map, ADDRESS_SPACE_PROGRAM, 8 ) 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(0x9c00, 0x9c00) AM_MIRROR(0x03fe) AM_DEVWRITE("vid_u18", mc6845_address_w) + AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE("vid_u18", mc6845_register_r, mc6845_register_w) AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index fefd26c7304..01b9c0bbc0c 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -2625,7 +2625,7 @@ VIDEO_UPDATE( multi32 ) { UINT8 enablemask; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); /* update the visible area */ if (system32_videoram[0x1ff00/2] & 0x8000) diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 0e2e3ce214e..ff2670a9c11 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -279,7 +279,7 @@ WRITE16_HANDLER( seta_vregs_w ) ---- ---- ---- ---0 Coin #0 Counter */ if (ACCESSING_BITS_0_7) { - const device_config *x1_010 = devtag_get_device(space->machine, SOUND, "x1"); + const device_config *x1_010 = devtag_get_device(space->machine, "x1"); seta_coin_lockout_w (space->machine, data & 0x0f); if (x1_010 != NULL) seta_sound_enable_w (x1_010, data & 0x20); diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c index cc2ea5dde23..46f62299ae9 100644 --- a/src/mame/video/skydiver.c +++ b/src/mame/video/skydiver.c @@ -130,7 +130,7 @@ WRITE8_HANDLER( skydiver_lamp_d_w ) WRITE8_HANDLER( skydiver_2000_201F_w ) { - const device_config *discrete = devtag_get_device(space->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(space->machine, "discrete"); int bit = offset & 0x01; watchdog_reset_w(space,0,0); diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c index 5bbef7e4bbf..f871548cf69 100644 --- a/src/mame/video/sprint4.c +++ b/src/mame/video/sprint4.c @@ -95,7 +95,7 @@ VIDEO_EOF( sprint4 ) /* check for sprite-playfield collisions */ - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); for (i = 0; i < 4; i++) { diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c index 71a3d429b19..e0520c51c45 100644 --- a/src/mame/video/starcrus.c +++ b/src/mame/video/starcrus.c @@ -64,7 +64,7 @@ VIDEO_START( starcrus ) WRITE8_HANDLER( starcrus_ship_parm_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); s1_sprite = data&0x1f; engine1_on = ((data&0x20)>>5)^0x01; @@ -90,7 +90,7 @@ WRITE8_HANDLER( starcrus_ship_parm_1_w ) WRITE8_HANDLER( starcrus_ship_parm_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); s2_sprite = data&0x1f; set_led_status(2,~data & 0x80); /* game over lamp */ @@ -118,7 +118,7 @@ WRITE8_HANDLER( starcrus_ship_parm_2_w ) WRITE8_HANDLER( starcrus_proj_parm_1_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); p1_sprite = data&0x0f; launch1_on = ((data&0x20)>>5)^0x01; @@ -157,7 +157,7 @@ WRITE8_HANDLER( starcrus_proj_parm_1_w ) WRITE8_HANDLER( starcrus_proj_parm_2_w ) { - const device_config *samples = devtag_get_device(space->machine, SOUND, "samples"); + const device_config *samples = devtag_get_device(space->machine, "samples"); p2_sprite = data&0x0f; launch2_on = ((data&0x20)>>5)^0x01; diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index 6dae787f4eb..bb6e836b36f 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -41,9 +41,9 @@ VIDEO_UPDATE( subs ) { int offs; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); - const device_config *discrete = devtag_get_device(screen->machine, SOUND, "discrete"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); + const device_config *discrete = devtag_get_device(screen->machine, "discrete"); /* for every character in the Video RAM, check if it has been modified */ /* since last time and update it accordingly. */ diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index 29b97abeef3..4877d1cae27 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -216,8 +216,8 @@ VIDEO_START( tbowl ) VIDEO_UPDATE( tbowl ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index f4bd6efaa51..a59b46f6b5f 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -536,9 +536,9 @@ VIDEO_UPDATE( tceptor ) int pri; int bg_center = 144 - ((((bg1_scroll_x + bg2_scroll_x ) & 0x1ff) - 288) / 2); - const device_config *_2d_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "2d"); - const device_config *_3d_left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "3dleft"); - const device_config *_3d_right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "3dright"); + const device_config *_2d_screen = devtag_get_device(screen->machine, "2d"); + const device_config *_3d_left_screen = devtag_get_device(screen->machine, "3dleft"); + const device_config *_3d_right_screen = devtag_get_device(screen->machine, "3dright"); if (screen != _2d_screen) { diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 8fd68b4895d..32e3f628772 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -672,8 +672,8 @@ VIDEO_UPDATE( rocknms ) int scr_pri; int rot_pri; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); /* Black background color */ if (screen == left_screen) diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c index 23b709ef33e..6b56c5e05d1 100644 --- a/src/mame/video/tia.c +++ b/src/mame/video/tia.c @@ -1863,7 +1863,7 @@ WRITE8_HANDLER( tia_w ) case 0x18: /* AUDF1 */ case 0x19: /* AUDV0 */ case 0x1A: /* AUDV1 */ - tia_sound_w(devtag_get_device(space->machine, SOUND, "tia"), offset, data); + tia_sound_w(devtag_get_device(space->machine, "tia"), offset, data); break; case 0x1B: diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 0b966b00613..a2dcdfe0574 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -1004,12 +1004,12 @@ static void toaplan2_scroll_reg_data_w(running_machine *machine, offs_t offset, if ((toaplan2_sub_cpu == CPU_2_Z80) && (data == 3)) { /* HACK! When tilted, sound CPU needs to be reset. */ - const device_config *ym = device_list_find_by_tag(machine->config->devicelist, SOUND, "ym"); + const device_config *ym = devtag_get_device(machine, "ym"); if (ym && (sound_get_type(ym) == SOUND_YM3812)) { cpu_set_input_line(machine->cpu[1], INPUT_LINE_RESET, PULSE_LINE); - devtag_reset(machine, SOUND, "ym"); + devtag_reset(machine, "ym"); } } diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c index efa5084e20d..dd7ca645264 100644 --- a/src/mame/video/triplhnt.c +++ b/src/mame/video/triplhnt.c @@ -130,7 +130,7 @@ static void draw_sprites(running_machine *machine, bitmap_t* bitmap, const recta VIDEO_UPDATE( triplhnt ) { - const device_config *discrete = devtag_get_device(screen->machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(screen->machine, "discrete"); tilemap_mark_all_tiles_dirty(bg_tilemap); diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index db5648c92f7..b0ef5af06cc 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -1173,9 +1173,9 @@ static void tx1_combine_layers(running_machine *machine, bitmap_t *bitmap, int s VIDEO_UPDATE( tx1 ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *centre_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "cscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *centre_screen = devtag_get_device(screen->machine, "cscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { @@ -2442,9 +2442,9 @@ VIDEO_EOF( buggyboy ) VIDEO_UPDATE( buggyboy ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *center_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "cscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *center_screen = devtag_get_device(screen->machine, "cscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c index 852f859bbe4..e09565c04ae 100644 --- a/src/mame/video/ultratnk.c +++ b/src/mame/video/ultratnk.c @@ -96,7 +96,7 @@ VIDEO_EOF( ultratnk ) { int i; UINT16 BG = colortable_entry_get_value(machine->colortable, 0); - const device_config *discrete = devtag_get_device(machine, SOUND, "discrete"); + const device_config *discrete = devtag_get_device(machine, "discrete"); /* check for sprite-playfield collisions */ diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c index 6d682e707c5..84e047b62c3 100644 --- a/src/mame/video/vsnes.c +++ b/src/mame/video/vsnes.c @@ -68,8 +68,8 @@ VIDEO_UPDATE( vsnes ) VIDEO_UPDATE( vsdual ) { - const device_config *top_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "top"); - const device_config *bottom_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "bottom"); + const device_config *top_screen = devtag_get_device(screen->machine, "top"); + const device_config *bottom_screen = devtag_get_device(screen->machine, "bottom"); /* render the ppu's */ if (screen == top_screen) diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index 9922939af62..1475dbf5772 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -112,8 +112,8 @@ VIDEO_UPDATE( warriorb ) int xoffs = 0, screen_number = -1; UINT8 layer[3], nodraw; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c index 02eac3c7fc7..ea01de2cd7e 100644 --- a/src/mame/video/xmen.c +++ b/src/mame/video/xmen.c @@ -135,8 +135,8 @@ VIDEO_UPDATE( xmen6p ) { int x,y; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); + const device_config *left_screen = devtag_get_device(screen->machine, "lscreen"); + const device_config *right_screen = devtag_get_device(screen->machine, "rscreen"); if (screen == left_screen) for(y=0;y<32*8;y++)