summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/sharc/sharc.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-03 18:24:54 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-03 18:24:54 +0000
commit894a91d188239a6426bd70ffab1f275bdd78396b (patch)
treeeda10b2b878b973ac6a8fd5d5816c212de1f2fe2 /src/emu/cpu/sharc/sharc.c
parentf3d1a457841b4790de2573e13bc8a7816ff8bd4b (diff)
DEVINFO_* to CPU_INFO_*, and some cleanups (no whatsnew)
Diffstat (limited to 'src/emu/cpu/sharc/sharc.c')
-rw-r--r--src/emu/cpu/sharc/sharc.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c
index 342c800acaf..974553a3156 100644
--- a/src/emu/cpu/sharc/sharc.c
+++ b/src/emu/cpu/sharc/sharc.c
@@ -1060,7 +1060,7 @@ static CPU_GET_INFO( sharc )
case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(SHARC_REGS); break;
case CPUINFO_INT_INPUT_LINES: info->i = 32; break;
case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break;
- case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break;
+ case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break;
case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break;
case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break;
case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 8; break;
@@ -1068,15 +1068,15 @@ static CPU_GET_INFO( sharc )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 32; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 32; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -2; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
@@ -1193,13 +1193,13 @@ static CPU_GET_INFO( sharc )
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
case CPUINFO_FCT_READ: info->read = CPU_READ_NAME(sharc); break;
case CPUINFO_FCT_READOP: info->readop = CPU_READOP_NAME(sharc); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(internal_pgm); break;
+ case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(internal_pgm); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_FAMILY: strcpy(info->s, "SHARC"); break;
- case DEVINFO_STR_VERSION: strcpy(info->s, "2.01"); break;
- case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
- case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break;
+ case CPUINFO_STR_FAMILY: strcpy(info->s, "SHARC"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "2.01"); break;
+ case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case CPUINFO_STR_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break;
case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break;
@@ -1313,7 +1313,7 @@ CPU_GET_INFO( adsp21062 )
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(adsp21062); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_NAME: strcpy(info->s, "ADSP21062"); break;
+ case CPUINFO_STR_NAME: strcpy(info->s, "ADSP21062"); break;
default: CPU_GET_INFO_CALL(sharc); break;
}