summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2010-06-13 13:31:41 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2010-06-13 13:31:41 +0000
commit1b391a86174c01afe03b13785c47fe39cb60b03b (patch)
tree39fd3c955a95a5396392f5a1eb274eef2f746b61
parent4353b40864584bf0dec4b968981353ba58bff244 (diff)
Removed not needed constant, set proper return type and added call to m4510 core too (no whatsnew)
-rw-r--r--src/emu/cpu/m6502/m4510.c7
-rw-r--r--src/emu/cpu/m6502/m4510.h2
-rw-r--r--src/emu/cpu/m6502/m6502.c2
-rw-r--r--src/emu/cpu/m6502/m6502.h8
4 files changed, 7 insertions, 12 deletions
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index 5b451fc6b03..d99ea8e99fa 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -349,11 +349,11 @@ static void m4510_set_irq_line(m4510_Regs *cpustate, int irqline, int state)
}
}
-static UINT8 m4510_get_port(m4510_Regs *cpustate)
+UINT8 m4510_get_port(cpu_device *device)
{
+ m4510_Regs *cpustate = get_safe_token(device);
return (cpustate->port & cpustate->ddr) | (cpustate->ddr ^ 0xff);
}
-
static READ8_HANDLER( m4510_read_0000 )
{
UINT8 result = 0x00;
@@ -388,7 +388,7 @@ static WRITE8_HANDLER( m4510_write_0000 )
}
if (cpustate->port_write)
- cpustate->port_write(cpustate->device, 0, m4510_get_port(cpustate));
+ cpustate->port_write(cpustate->device, 0, m4510_get_port(downcast<cpu_device *>(space->cpu)));
}
static ADDRESS_MAP_START(m4510_mem, ADDRESS_SPACE_PROGRAM, 8)
@@ -506,7 +506,6 @@ CPU_GET_INFO( m4510 )
case CPUINFO_INT_REGISTER + M4510_MEM5: info->i = cpustate->mem[5]; break;
case CPUINFO_INT_REGISTER + M4510_MEM6: info->i = cpustate->mem[6]; break;
case CPUINFO_INT_REGISTER + M4510_MEM7: info->i = cpustate->mem[7]; break;
- case CPUINFO_INT_M6510_PORT: info->i = m4510_get_port(cpustate); 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(m4510); break;
diff --git a/src/emu/cpu/m6502/m4510.h b/src/emu/cpu/m6502/m4510.h
index 2bd84711aaf..a052d6bb768 100644
--- a/src/emu/cpu/m6502/m4510.h
+++ b/src/emu/cpu/m6502/m4510.h
@@ -45,4 +45,6 @@ CPU_GET_INFO( m4510 );
extern CPU_DISASSEMBLE( m4510 );
+UINT8 m4510_get_port(cpu_device *device);
+
#endif /* __M4510_H__ */
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index 401bd184b4d..52bd2860774 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -355,7 +355,7 @@ static CPU_RESET( m6510 )
cpustate->ddr = 0x00;
}
-int m6510_get_port(cpu_device *device)
+UINT8 m6510_get_port(cpu_device *device)
{
m6502_Regs *cpustate = get_safe_token(device);
return (cpustate->port & cpustate->ddr) | (cpustate->ddr ^ 0xff);
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index 5347d71c81f..2b454492262 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -65,12 +65,6 @@ struct _m6502_interface
m6510_port_write_func port_write_func;
};
-
-enum
-{
- CPUINFO_INT_M6510_PORT = CPUINFO_INT_CPU_SPECIFIC
-};
-
extern CPU_GET_INFO( m6502 );
#define CPU_M6502 CPU_GET_INFO_NAME( m6502 )
@@ -97,7 +91,7 @@ extern CPU_GET_INFO( m6510 );
extern CPU_DISASSEMBLE( m6510 );
-int m6510_get_port(cpu_device *device);
+UINT8 m6510_get_port(cpu_device *device);
#define M6510T_A M6502_A
#define M6510T_X M6502_X