diff options
| author | 2011-03-27 07:37:24 +0000 | |
|---|---|---|
| committer | 2011-03-27 07:37:24 +0000 | |
| commit | 202d7680a44bec9fa1016e8ba6eeaaba51ef15ab (patch) | |
| tree | 6021eb4c3d7324779eaeeab30875f68d42ea2348 /src/emu/devcb.c | |
| parent | 382e3998b1ca12e6af774cc2652ae515f526ff44 (diff) | |
Created new enum type address_spacenum for specifying an address
space by index. Update functions and methods that accepted an
address space index to take an address_spacenum instead. Note that
this means you can't use a raw integer in ADDRESS_SPACE macros, so
instead of 0 use the enumerated AS_0.
Standardized the project on the shortened constants AS_* over the
older ADDRESS_SPACE_*. Removed the latter to prevent confusion.
Also centralized the location of these definitions to memory.h.
Diffstat (limited to 'src/emu/devcb.c')
| -rw-r--r-- | src/emu/devcb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/devcb.c b/src/emu/devcb.c index 7f90abbfda0..d70af9f9507 100644 --- a/src/emu/devcb.c +++ b/src/emu/devcb.c @@ -48,9 +48,9 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea } /* address space handlers */ - else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL) + else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL) { - FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM); + FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM); device_t *targetdev = device->siblingdevice(config->tag); if (targetdev == NULL) @@ -137,9 +137,9 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w } /* address space handlers */ - else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL) + else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL) { - FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM); + FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM); device_t *targetdev = device->siblingdevice(config->tag); if (targetdev == NULL) @@ -235,9 +235,9 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf } /* address space handlers */ - else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL) + else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL) { - FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM); + FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM); device_t *targetdev = device->siblingdevice(config->tag); if (targetdev == NULL) @@ -314,9 +314,9 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c } /* address space handlers */ - else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL) + else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL) { - FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM); + FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM); device_t *targetdev = device->siblingdevice(config->tag); if (targetdev == NULL) |
