Removed DEVCB_DEVICE_LINE. (nw)

This commit is contained in:
Curt Coder 2014-03-16 11:27:54 +00:00
parent 88e5155cc0
commit e2d550b191
10 changed files with 18 additions and 13 deletions

View File

@ -134,9 +134,9 @@ void s3c2410_touch_screen( device_t *device, int state)
s3c24xx_touch_screen( device, state);
}
WRITE_LINE_DEVICE_HANDLER( s3c2410_pin_frnb_w )
WRITE_LINE_MEMBER( s3c2410_device::frnb_w )
{
s3c24xx_pin_frnb_w( device, state);
s3c24xx_pin_frnb_w(this, state);
}
void s3c2410_nand_calculate_mecc( UINT8 *data, UINT32 size, UINT8 *mecc)

View File

@ -52,6 +52,9 @@ public:
// access to legacy token
struct s3c24xx_t *token() const { assert(m_token != NULL); return m_token; }
DECLARE_WRITE_LINE_MEMBER( frnb_w );
// device-level overrides
virtual void device_config_complete();
virtual void device_start();

View File

@ -148,7 +148,7 @@ void s3c2440_request_eint( device_t *device, UINT32 number)
s3c24xx_request_eint( device, number);
}
WRITE_LINE_DEVICE_HANDLER( s3c2440_pin_frnb_w )
WRITE_LINE_MEMBER( s3c2440_device::frnb_w )
{
s3c24xx_pin_frnb_w( device, state);
s3c24xx_pin_frnb_w(this, state);
}

View File

@ -52,6 +52,9 @@ public:
// access to legacy token
struct s3c24xx_t *token() const { assert(m_token != NULL); return m_token; }
DECLARE_WRITE_LINE_MEMBER( frnb_w );
protected:
// device-level overrides
virtual void device_config_complete();
@ -134,7 +137,6 @@ void s3c2440_touch_screen( device_t *device, int state);
void s3c2440_request_irq( device_t *device, UINT32 int_type);
void s3c2440_request_eint( device_t *device, UINT32 number);
WRITE_LINE_DEVICE_HANDLER( s3c2440_pin_frnb_w );
/*******************************************************************************
MACROS & CONSTANTS

View File

@ -526,6 +526,7 @@ public:
DECLARE_READ8_MEMBER( amigacd_tpi6525_portc_r );
DECLARE_WRITE8_MEMBER( amigacd_tpi6525_portb_w );
DECLARE_WRITE_LINE_MEMBER( amigacd_tpi6525_irq );
int m_centronics_busy;
int m_centronics_perror;

View File

@ -566,7 +566,7 @@ static const legacy_mos6526_interface cia_1_cdtv_intf =
static const tpi6525_interface cdtv_tpi_intf =
{
DEVCB_DEVICE_LINE("tpi6525", amigacd_tpi6525_irq),
DEVCB_DRIVER_LINE_MEMBER(amiga_state, amigacd_tpi6525_irq),
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,

View File

@ -228,7 +228,7 @@ static S3C2440_INTERFACE( mini2440_s3c2440_intf )
static NAND_INTERFACE( mini2440_nand_intf )
{
NAND_CHIP_K9F1G08U0B,
DEVCB_DEVICE_LINE( "s3c2440", s3c2440_pin_frnb_w)
DEVCB_DEVICE_LINE_MEMBER("s3c2440", s3c2440_device, frnb_w)
};
static MACHINE_CONFIG_START( mini2440, mini2440_state )

View File

@ -296,7 +296,7 @@ static S3C2410_INTERFACE( palmz22_s3c2410_intf )
static NAND_INTERFACE( palmz22_nand_intf )
{
NAND_CHIP_K9F5608U0D_J,
DEVCB_DEVICE_LINE( "s3c2410", s3c2410_pin_frnb_w)
DEVCB_DEVICE_LINE_MEMBER("s3c2410", s3c2410_device, frnb_w)
};
static MACHINE_CONFIG_START( palmz22, palmz22_state )

View File

@ -492,9 +492,11 @@ static void amigacd_tpi6525_irq_trampoline(device_t *device, int level)
}
}
WRITE_LINE_DEVICE_HANDLER( amigacd_tpi6525_irq )
WRITE_LINE_MEMBER( amiga_state::amigacd_tpi6525_irq )
{
amigacd_tpi6525_irq_trampoline(device, state);
tpi6525_device *tpi = machine().device<tpi6525_device>("tpi6525");
amigacd_tpi6525_irq_trampoline(tpi, state);
}
static void cdrom_status_enabled( running_machine &machine, int level )

View File

@ -5,8 +5,5 @@
MACHINE_START( amigacd );
MACHINE_RESET( amigacd );
/* 6525tpi */
WRITE_LINE_DEVICE_HANDLER( amigacd_tpi6525_irq );
#endif /* __AMIGACD_H__ */