MAME SVN History

199869 Revisions

r22834 Wednesday 15th May, 2013 at 18:20:38 UTC by Wilbert Pol
pic8259.c: Get rid of anonymous timer. (nw)

[src/emu/machine]

pic8259.c pic8259.h

trunk/src/emu/machine/pic8259.c
r22833	r22834
21	21	#define LOG_GENERAL 0
22	22
23	23
24		~~TIMER_CALLBACK_MEMBER(~~ pic8259_device::timerproc )
	24	void pic8259_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
25	25	{
26	26	int irq;
27	27	UINT8 mask;
r22833	r22834
381	381
382	382	assert(intf != NULL);
383	383
384		m_timer = machine().scheduler().timer_alloc( timer_expired_delegate( FUNC(pic8259_device::timerproc), this) );
385
386	384	/* resolve callbacks */
387	385	m_out_int_func.resolve(intf->out_int_func, *this);
388	386	m_sp_en_func.resolve(intf->sp_en_func, *this);

trunk/src/emu/machine/pic8259.h
r22833	r22834
48	48
49	49	UINT8 inta_r();
50	50
51		TIMER_CALLBACK_MEMBER( timerproc );
52
53	51	protected:
54	52	// device-level overrides
55	53	virtual void device_config_complete();
56	54	virtual void device_start();
57	55	virtual void device_reset();
	56	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
58	57
59	58	private:
60		inline void set_timer() { m_timer->adjust(attotime::zero); }
	59	static const device_timer_id TIMER_CHECK_IRQ = 0;
	60
	61	inline void set_timer() { timer_set(attotime::zero, TIMER_CHECK_IRQ); }
61	62	void set_irq_line(int irq, int state);
62	63
63	64
r22833	r22834
74	75	devcb_resolved_read_line m_sp_en_func;
75	76	devcb_resolved_read8 m_read_slave_ack_func;
76	77
77		emu_timer *m_timer;
78
79	78	pic8259_state_t m_state;
80	79
81	80	UINT8 m_isr;

199869 Revisions