summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/m6805
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/m6805
parentf3d1a457841b4790de2573e13bc8a7816ff8bd4b (diff)
DEVINFO_* to CPU_INFO_*, and some cleanups (no whatsnew)
Diffstat (limited to 'src/emu/cpu/m6805')
-rw-r--r--src/emu/cpu/m6805/m6805.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index b4daa77d5ef..b2157809a89 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -971,7 +971,7 @@ CPU_GET_INFO( m6805 )
case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m6805_Regs); break;
case CPUINFO_INT_INPUT_LINES: info->i = 1; break;
case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break;
- case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
+ case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break;
case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break;
case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break;
@@ -979,15 +979,15 @@ CPU_GET_INFO( m6805 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; 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 = 8; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; 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 + M6805_IRQ_LINE: info->i = cpustate->irq_state[M6805_IRQ_LINE]; break;
@@ -1012,11 +1012,11 @@ CPU_GET_INFO( m6805 )
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->iCount; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_NAME: strcpy(info->s, "M6805"); break;
- case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola 6805"); break;
- case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
- case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
- case DEVINFO_STR_CREDITS: strcpy(info->s, "The MAME team."); break;
+ case CPUINFO_STR_NAME: strcpy(info->s, "M6805"); break;
+ case CPUINFO_STR_FAMILY: strcpy(info->s, "Motorola 6805"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case CPUINFO_STR_CREDITS: strcpy(info->s, "The MAME team."); break;
case CPUINFO_STR_FLAGS:
sprintf(info->s, "%c%c%c%c%c%c%c%c",
@@ -1066,7 +1066,7 @@ CPU_GET_INFO( m68hc05eg )
case CPUINFO_INT_INPUT_STATE + M68HC05EG_INT_TIMER: info->i = cpustate->irq_state[M68HC05EG_INT_TIMER]; break;
case CPUINFO_INT_INPUT_STATE + M68HC05EG_INT_CPI: info->i = cpustate->irq_state[M68HC05EG_INT_CPI]; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m68hc05eg); break;
@@ -1074,7 +1074,7 @@ CPU_GET_INFO( m68hc05eg )
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(m68hc05eg); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_NAME: strcpy(info->s, "M68HC05EG"); break;
+ case CPUINFO_STR_NAME: strcpy(info->s, "M68HC05EG"); break;
default: CPU_GET_INFO_CALL(m6805); break;
}
@@ -1111,7 +1111,7 @@ CPU_GET_INFO( m68705 )
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(m68705); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_NAME: strcpy(info->s, "M68705"); break;
+ case CPUINFO_STR_NAME: strcpy(info->s, "M68705"); break;
default: CPU_GET_INFO_CALL(m6805); break;
}
@@ -1160,7 +1160,7 @@ CPU_GET_INFO( hd63705 )
case CPUINFO_INT_INPUT_STATE + HD63705_INT_ADCONV: info->i = cpustate->irq_state[HD63705_INT_ADCONV]; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->irq_state[HD63705_INT_NMI]; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(hd63705); break;
@@ -1168,9 +1168,9 @@ CPU_GET_INFO( hd63705 )
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(hd63705); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
- case DEVINFO_STR_NAME: strcpy(info->s, "HD63705"); break;
- case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
- case DEVINFO_STR_CREDITS: strcpy(info->s, "Keith Wilkins, Juergen Buchmueller"); break;
+ case CPUINFO_STR_NAME: strcpy(info->s, "HD63705"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case CPUINFO_STR_CREDITS: strcpy(info->s, "Keith Wilkins, Juergen Buchmueller"); break;
default: CPU_GET_INFO_CALL(m6805); break;
}