summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/mips/r3000.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-01-21 06:05:57 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-01-21 06:05:57 +0000
commit1a2c20441f9bea50a435dbae1e0aeab991d4d78d (patch)
treecdb55bcc02838ab541632af76fcd77fa5008a8f5 /src/emu/cpu/mips/r3000.c
parenta5668c2eb9d17e3e51f3230db68d3aec09c34507 (diff)
Remove some aliases between CPUINFO_ and DEVINFO_ to help clarify
usage. Also converted a few more places to use the new accessors.
Diffstat (limited to 'src/emu/cpu/mips/r3000.c')
-rw-r--r--src/emu/cpu/mips/r3000.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index 03f71e7704f..7f5e2fc926e 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -1179,15 +1179,15 @@ static CPU_GET_INFO( r3000 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case CPUINFO_INT_DATABUS_WIDTH_PROGRAM: info->i = 32; break;
- case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 29; break;
- case CPUINFO_INT_ADDRBUS_SHIFT_PROGRAM: info->i = 0; break;
- case CPUINFO_INT_DATABUS_WIDTH_DATA: info->i = 0; break;
- case CPUINFO_INT_ADDRBUS_WIDTH_DATA: info->i = 0; break;
- case CPUINFO_INT_ADDRBUS_SHIFT_DATA: info->i = 0; break;
- case CPUINFO_INT_DATABUS_WIDTH_IO: info->i = 0; break;
- case CPUINFO_INT_ADDRBUS_WIDTH_IO: info->i = 0; break;
- case CPUINFO_INT_ADDRBUS_SHIFT_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 29; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + R3000_IRQ0: info->i = (r3000->cpr[0][COP0_Cause] & 0x400) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + R3000_IRQ1: info->i = (r3000->cpr[0][COP0_Cause] & 0x800) ? ASSERT_LINE : CLEAR_LINE; break;