Random small cleanups (nw)

This commit is contained in:
Ivan Vangelista 2014-10-01 16:08:34 +00:00
parent 9471c262de
commit 1fe6aefd73
5 changed files with 14 additions and 13 deletions

View File

@ -61,7 +61,7 @@
UINT8 sc4_state::read_input_matrix(running_machine &machine, int row)
UINT8 sc4_state::read_input_matrix(int row)
{
ioport_port* portnames[16] = { m_io1, m_io2, m_io3, m_io4, m_io5, m_io6, m_io7, m_io8, m_io9, m_io10, m_io11, m_io12 };
UINT8 value;
@ -170,7 +170,7 @@ READ16_MEMBER(sc4_state::sc4_mem_r)
if (mem_mask&0x00ff)
{
retvalue = read_input_matrix(machine(), (addr & 0x00f0)>>4);
retvalue = read_input_matrix((addr & 0x00f0)>>4);
}
return retvalue;
}

View File

@ -722,7 +722,7 @@ INTERRUPT_GEN_MEMBER(segas32_state::start_of_vblank_int)
system32_set_vblank(1);
machine().scheduler().timer_set(m_screen->time_until_pos(0), timer_expired_delegate(FUNC(segas32_state::end_of_vblank_int),this));
if (m_system32_prot_vblank)
(*m_system32_prot_vblank)(&device);
(this->*m_system32_prot_vblank)();
}
@ -4690,7 +4690,7 @@ DRIVER_INIT_MEMBER(segas32_state,darkedge)
/* install protection handlers */
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::darkedge_protection_r),this), write16_delegate(FUNC(segas32_state::darkedge_protection_w),this));
m_system32_prot_vblank = darkedge_fd1149_vblank;
m_system32_prot_vblank = &segas32_state::darkedge_fd1149_vblank;
}
DRIVER_INIT_MEMBER(segas32_state,dbzvrvs)
@ -4735,7 +4735,7 @@ DRIVER_INIT_MEMBER(segas32_state,f1lap)
m_maincpu->space(AS_PROGRAM).install_read_handler(0x801000, 0x801003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
// m_maincpu->space(AS_PROGRAM).install_write_handler(0x800048, 0x800049, write16_delegate(FUNC(segas32_state::f1en_comms_echo_w),this));
m_system32_prot_vblank = f1lap_fd1149_vblank;
m_system32_prot_vblank = &segas32_state::f1lap_fd1149_vblank;
m_sw1_output = &segas32_state::f1lap_sw1_output;
}

View File

@ -141,7 +141,7 @@ public:
UINT16 m_mainram[0x10000/2];
UINT8 read_input_matrix(running_machine &machine, int row);
UINT8 read_input_matrix(int row);
DECLARE_WRITE_LINE_MEMBER(bfmdm01_busy);

View File

@ -97,7 +97,8 @@ public:
UINT8 m_sprite_control_latched[8];
UINT8 m_sprite_control[8];
UINT32 *m_spriteram_32bit;
void (*m_system32_prot_vblank)(device_t *device);
typedef void (segas32_state::*prot_vblank_func)();
prot_vblank_func m_system32_prot_vblank;
int m_print_count;
DECLARE_WRITE16_MEMBER(ga2_dpram_w);
DECLARE_READ16_MEMBER(ga2_dpram_r);
@ -269,9 +270,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(ym3438_irq_handler);
void signal_sound_irq(int which);
void clear_sound_irq(int which);
void darkedge_fd1149_vblank();
void f1lap_fd1149_vblank();
};
/*----------- defined in machine/segas32.c -----------*/
void darkedge_fd1149_vblank(device_t *device);
void f1lap_fd1149_vblank(device_t *device);
extern const UINT8 ga2_v25_opcode_table[];

View File

@ -203,9 +203,9 @@ WRITE16_MEMBER(segas32_state::brival_protection_w)
******************************************************************************
******************************************************************************/
void darkedge_fd1149_vblank(device_t *device)
void segas32_state::darkedge_fd1149_vblank()
{
address_space &space = device->memory().space(AS_PROGRAM);
address_space &space = m_maincpu->space(AS_PROGRAM);
space.write_word(0x20f072, 0);
space.write_word(0x20f082, 0);
@ -239,9 +239,9 @@ READ16_MEMBER(segas32_state::darkedge_protection_r)
******************************************************************************
******************************************************************************/
void f1lap_fd1149_vblank(device_t *device)
void segas32_state::f1lap_fd1149_vblank()
{
address_space &space = device->memory().space(AS_PROGRAM);
address_space &space = m_maincpu->space(AS_PROGRAM);
space.write_byte(0x20F7C6, 0);