Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-20 20:58:51 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed not needed constant, set proper return type and added call to m4510 core too (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2010-06-13 13:31:41 +00:00
parent 4353b40864
commit 1b391a8617
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/cpu/m6502/m4510.c
View File

@ -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); return (cpustate->port & cpustate->ddr) | (cpustate->ddr ^ 0xff);
} }
static READ8_HANDLER( m4510_read_0000 ) static READ8_HANDLER( m4510_read_0000 )
{ {
UINT8 result = 0x00; UINT8 result = 0x00;
@ -388,7 +388,7 @@ static WRITE8_HANDLER( m4510_write_0000 )
} }
if (cpustate->port_write) 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) 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_MEM5: info->i = cpustate->mem[5]; break;
case CPUINFO_INT_REGISTER + M4510_MEM6: info->i = cpustate->mem[6]; 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_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 --- */ /* --- 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; case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m4510); break;

2
src/emu/cpu/m6502/m4510.h
View File

@ -45,4 +45,6 @@ CPU_GET_INFO( m4510 );
extern CPU_DISASSEMBLE( m4510 ); extern CPU_DISASSEMBLE( m4510 );
UINT8 m4510_get_port(cpu_device *device);
#endif /* __M4510_H__ */ #endif /* __M4510_H__ */

2
src/emu/cpu/m6502/m6502.c
View File

@ -355,7 +355,7 @@ static CPU_RESET( m6510 )
cpustate->ddr = 0x00; cpustate->ddr = 0x00;
} }
int m6510_get_port(cpu_device *device) UINT8 m6510_get_port(cpu_device *device)
{ {
m6502_Regs *cpustate = get_safe_token(device); m6502_Regs *cpustate = get_safe_token(device);
return (cpustate->port & cpustate->ddr) | (cpustate->ddr ^ 0xff); return (cpustate->port & cpustate->ddr) | (cpustate->ddr ^ 0xff);

8
src/emu/cpu/m6502/m6502.h
View File

@ -65,12 +65,6 @@ struct _m6502_interface
m6510_port_write_func port_write_func; m6510_port_write_func port_write_func;
}; };
enum
{
CPUINFO_INT_M6510_PORT = CPUINFO_INT_CPU_SPECIFIC
};
extern CPU_GET_INFO( m6502 ); extern CPU_GET_INFO( m6502 );
#define CPU_M6502 CPU_GET_INFO_NAME( m6502 ) #define CPU_M6502 CPU_GET_INFO_NAME( m6502 )
@ -97,7 +91,7 @@ extern CPU_GET_INFO( m6510 );
extern CPU_DISASSEMBLE( 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_A M6502_A
#define M6510T_X M6502_X #define M6510T_X M6502_X