Previous

199869 Revisions

Next

r29595 Sunday 13th April, 2014 at 10:09:43 UTC by Fabio Priuli
updated ttl74148 and ttl74153 to use delegates. nw.

[src/emu/machine]	74148.c 74148.h 74153.c 74153.h
[src/mame/drivers]	carpolo.c vertigo.c
[src/mame/includes]	carpolo.h vertigo.h
[src/mame/machine]	carpolo.c vertigo.c

trunk/src/mame/drivers/carpolo.c

r29594	r29595
221	221	GFXDECODE_ENTRY( "gfx3", 0, alphalayout,  12*2+2*16, 4 )
222	222	GFXDECODE_END
223	223
224		static const ttl74148_config carpolo_ttl74148_intf =
225		{
226		carpolo_74148_3s_cb
227		};
228
229		static const ttl74153_config carpolo_ttl74153_intf =
230		{
231		NULL
232		};
233
234	224	/*************************************
235	225	*
236	226	*  Machine driver
r29594	r29595
280	270	MCFG_DEVICE_ADD("7474_1a_1", TTL7474, 0)
281	271	MCFG_DEVICE_ADD("7474_1a_2", TTL7474, 0)
282	272
283		MCFG_74148_ADD("74148_3s", carpolo_ttl74148_intf)
284		MCFG_74153_ADD("74153_1k", carpolo_ttl74153_intf)
	273	MCFG_DEVICE_ADD("74148_3s", TTL74148, 0)
	274	MCFG_74148_OUTPUT_CB(carpolo_state, ttl74148_3s_cb)
285	275
	276	MCFG_DEVICE_ADD("74153_1k", TTL74153, 0)
	277
286	278	/* video hardware */
287	279	MCFG_SCREEN_ADD("screen", RASTER)
288	280	MCFG_SCREEN_REFRESH_RATE(60)

trunk/src/mame/drivers/vertigo.c

r29594	r29595
103	103	INPUT_PORTS_END
104	104
105	105
106		static const ttl74148_config vertigo_ttl74148_intf =
107		{
108		vertigo_update_irq
109		};
110	106	/*************************************
111	107	*
112	108	*  Machine driver
r29594	r29595
129	125	MCFG_PIT8253_OUT1_HANDLER(WRITELINE(vertigo_state, v_irq3_w))
130	126	MCFG_PIT8253_CLK2(240000)
131	127
132		MCFG_74148_ADD( "74148", vertigo_ttl74148_intf )
	128	MCFG_DEVICE_ADD("74148", TTL74148, 0)
	129	MCFG_74148_OUTPUT_CB(vertigo_state, update_irq)
133	130
134	131	/* motor controller */
135	132	/*

trunk/src/mame/machine/carpolo.c

r29594	r29595
55	55	#define CAR_BORDER_EXTRA_BITS       0x50
56	56
57	57
58		void carpolo_74148_3s_cb(device_t *device)
	58	TTL74148_OUTPUT_CB(carpolo_state::ttl74148_3s_cb)
59	59	{
60		carpolo_state *state = device->machine().driver_data<carpolo_state>();
61		state->m_maincpu->set_input_line(M6502_IRQ_LINE, state->m_ttl74148_3s->output_valid_r() ? CLEAR_LINE : ASSERT_LINE);
	60	m_maincpu->set_input_line(M6502_IRQ_LINE, m_ttl74148_3s->output_valid_r() ? CLEAR_LINE : ASSERT_LINE);
62	61	}
63	62
64	63

trunk/src/mame/machine/vertigo.c

r29594	r29595
30	30	*
31	31	*************************************/
32	32
33		void vertigo_update_irq(device_t *device)
	33	TTL74148_OUTPUT_CB(vertigo_state::update_irq)
34	34	{
35		vertigo_state *state = device->machine().driver_data<vertigo_state>();
36		if (state->m_irq_state < 7)
37		state->m_maincpu->set_input_line(state->m_irq_state ^ 7, CLEAR_LINE);
	35	if (m_irq_state < 7)
	36	m_maincpu->set_input_line(m_irq_state ^ 7, CLEAR_LINE);
38	37
39		state->m_irq_state = state->m_ttl74148->output_r();
	38	m_irq_state = m_ttl74148->output_r();
40	39
41		if (state->m_irq_state < 7)
42		state->m_maincpu->set_input_line(state->m_irq_state ^ 7, ASSERT_LINE);
	40	if (m_irq_state < 7)
	41	m_maincpu->set_input_line(m_irq_state ^ 7, ASSERT_LINE);
43	42	}
44	43
45	44

trunk/src/mame/includes/carpolo.h

r29594	r29595
107	107	DECLARE_WRITE_LINE_MEMBER(carpolo_7474_2u_1_q_cb);
108	108	DECLARE_WRITE_LINE_MEMBER(carpolo_7474_2u_2_q_cb);
109	109
	110	TTL74148_OUTPUT_CB(ttl74148_3s_cb);
	111
110	112	void remap_sprite_code(int bank, int code, int *remapped_code, int *flipy);
111	113	void normalize_coordinates(int *x1, int *y1, int *x2, int *y2);
112	114	int check_sprite_left_goal_collision(int x1, int y1, int code1, int flipy1, int goalpost_only);
r29594	r29595
123	125	int x2, int y2, int code2, int flipy2,
124	126	int *col_x, int *col_y);
125	127	};
126
127
128		/*----------- defined in machine/carpolo.c -----------*/
129
130		void carpolo_74148_3s_cb(device_t *device);

trunk/src/mame/includes/vertigo.h

r29594	r29595
130	130	TIMER_CALLBACK_MEMBER(sound_command_w);
131	131	DECLARE_WRITE_LINE_MEMBER(v_irq4_w);
132	132	DECLARE_WRITE_LINE_MEMBER(v_irq3_w);
	133	TTL74148_OUTPUT_CB(update_irq);
	134
133	135	void vertigo_vproc_init();
134	136	void vertigo_vproc_reset();
135	137	void am2901x4 (am2901 *bsp, microcode *mc);
r29594	r29595
137	139	void vertigo_vproc(int cycles, int irq4);
138	140	void update_irq_encoder(int line, int state);
139	141	};
140
141		/*----------- defined in machine/vertigo.c -----------*/
142
143		void vertigo_update_irq(device_t *device);

trunk/src/emu/machine/74153.c

r29594	r29595
40	40	const device_type TTL74153 = &device_creator<ttl74153_device>;
41	41
42	42	ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
43		: device_t(mconfig, TTL74153, "74153 TTL", tag, owner, clock, "74153", __FILE__),
44		m_a(0),
45		m_b(0)
	43	: device_t(mconfig, TTL74153, "74153 TTL", tag, owner, clock, "74153", __FILE__),
	44	m_a(0),
	45	m_b(0)
46	46	{
47	47	m_input_lines[0][0] = 0;
48	48	m_input_lines[0][1] = 0;
r29594	r29595
54	54	m_input_lines[1][3] = 0;
55	55
56	56	for (int i = 0; i < 2; i++)
57		m_enable[i] = 0;
	57	m_enable[i] = 0;
58	58
59	59	for (int i = 0; i < 2; i++)
60		m_output[i] = 0;
	60	m_output[i] = 0;
61	61
62	62	for (int i = 0; i < 2; i++)
63		m_last_output[i] = 0;
	63	m_last_output[i] = 0;
64	64	}
65	65
66	66	//-------------------------------------------------
67		//  device_config_complete - perform any
68		//  operations now that the configuration is
69		//  complete
70		//-------------------------------------------------
71
72		void ttl74153_device::device_config_complete()
73		{
74		// inherit a copy of the static data
75		const ttl74153_config *intf = reinterpret_cast<const ttl74153_config *>(static_config());
76		if (intf != NULL)
77		*static_cast<ttl74153_config *>(this) = *intf;
78
79		// or initialize to defaults if none provided
80		else
81		{
82		}
83		}
84
85		//-------------------------------------------------
86	67	//  device_start - device-specific startup
87	68	//-------------------------------------------------
88	69
89	70	void ttl74153_device::device_start()
90	71	{
	72	m_output_cb.bind_relative_to(*owner());
	73
91	74	save_item(NAME(m_enable));
92	75	save_item(NAME(m_last_output));
93	76	save_item(NAME(m_input_lines[0][0]));
r29594	r29595
146	129
147	130
148	131	/* call callback if either of the outputs changed */
149		if (  m_output_cb &&
150		((m_output[0] != m_last_output[0]) ||
151		(m_output[1] != m_last_output[1])))
	132	if (!m_output_cb.isnull() &&
	133	((m_output[0] != m_last_output[0]) || (m_output[1] != m_last_output[1])))
152	134	{
153	135	m_last_output[0] = m_output[0];
154	136	m_last_output[1] = m_output[1];
155	137
156		m_output_cb(this);
	138	m_output_cb();
157	139	}
158	140	}
159	141

trunk/src/emu/machine/74153.h

r29594	r29595
37	37	#define TTL74153_H
38	38
39	39
	40	typedef device_delegate<void (void)> ttl74153_output_delegate;
40	41
41		struct ttl74153_config
42		{
43		void (*m_output_cb)(device_t *device);
44		};
	42	#define TTL74153_OUTPUT_CB(_name) void _name(void)
45	43
46	44
47		class ttl74153_device : public device_t,
48		public ttl74153_config
	45	class ttl74153_device : public device_t
49	46	{
50	47	public:
51	48	ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
52	49	~ttl74153_device() {}
53	50
	51	static void set_output_callback(device_t &device, ttl74153_output_delegate callback) { downcast<ttl74153_device &>(device).m_output_cb = callback; }
	52
54	53	/* must call update() after setting the inputs */
55	54	void update();
56	55
r29594	r29595
62	61
63	62	protected:
64	63	// device-level overrides
65		virtual void device_config_complete();
66	64	virtual void device_start();
67	65	virtual void device_reset();
68	66
69	67	private:
70	68	// internal state
	69	ttl74153_output_delegate m_output_cb;
71	70
72	71	/* inputs */
73	72	int m_a;                  /* pin 14 */
r29594	r29595
84	83
85	84	extern const device_type TTL74153;
86	85
87		#define MCFG_74153_ADD(_tag, _config) \
88		MCFG_DEVICE_ADD(_tag, TTL74153, 0) \
89		MCFG_DEVICE_CONFIG(_config)
90	86
	87	#define MCFG_74153_OUTPUT_CB(_class, _method) \
	88	ttl74153_device::set_output_callback(*device, ttl74153_output_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
	89
91	90	#endif

trunk/src/emu/machine/74148.c

r29594	r29595
45	45	const device_type TTL74148 = &device_creator<ttl74148_device>;
46	46
47	47	ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
48		: device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__),
49		m_enable_input(0),
50		m_output(0),
51		m_output_valid(0),
52		m_enable_output(0),
53		m_last_output(0),
54		m_last_output_valid(0),
55		m_last_enable_output(0)
	48	: device_t(mconfig, TTL74148, "74148 TTL", tag, owner, clock, "74148", __FILE__),
	49	m_enable_input(0),
	50	m_output(0),
	51	m_output_valid(0),
	52	m_enable_output(0),
	53	m_last_output(0),
	54	m_last_output_valid(0),
	55	m_last_enable_output(0)
56	56	{
57	57	for (int i = 0; i < 8; i++)
58		m_input_lines[i] = 0;
	58	m_input_lines[i] = 0;
59	59	}
60	60
61	61	//-------------------------------------------------
62		//  device_config_complete - perform any
63		//  operations now that the configuration is
64		//  complete
65		//-------------------------------------------------
66
67		void ttl74148_device::device_config_complete()
68		{
69		// inherit a copy of the static data
70		const ttl74148_config *intf = reinterpret_cast<const ttl74148_config *>(static_config());
71		if (intf != NULL)
72		*static_cast<ttl74148_config *>(this) = *intf;
73
74		// or initialize to defaults if none provided
75		else
76		{
77		}
78
79		}
80
81		//-------------------------------------------------
82	62	//  device_start - device-specific startup
83	63	//-------------------------------------------------
84	64
85	65	void ttl74148_device::device_start()
86	66	{
	67	m_output_cb.bind_relative_to(*owner());
	68
87	69	save_item(NAME(m_input_lines));
88	70	save_item(NAME(m_enable_input));
89	71	save_item(NAME(m_output));
r29594	r29595
171	153
172	154
173	155	/* call callback if any of the outputs changed */
174		if (  m_output_cb &&
175		((m_output        != m_last_output) ||
176		(m_output_valid  != m_last_output_valid) ||
177		(m_enable_output != m_last_enable_output)))
	156	if (!m_output_cb.isnull() &&
	157	((m_output != m_last_output) ||
	158	(m_output_valid != m_last_output_valid) || (m_enable_output != m_last_enable_output)))
178	159	{
179	160	m_last_output = m_output;
180	161	m_last_output_valid = m_output_valid;
181	162	m_last_enable_output = m_enable_output;
182	163
183		m_output_cb(this);
	164	m_output_cb();
184	165	}
185	166	}
186	167

trunk/src/emu/machine/74148.h

r29594	r29595
42	42	#define TTL74148_H
43	43
44	44
	45	typedef device_delegate<void (void)> ttl74148_output_delegate;
45	46
46		struct ttl74148_config
47		{
48		void (*m_output_cb)(device_t *device);
49		};
	47	#define TTL74148_OUTPUT_CB(_name) void _name(void)
50	48
51	49
52		class ttl74148_device : public device_t,
53		public ttl74148_config
	50	class ttl74148_device : public device_t
54	51	{
55	52	public:
56	53	ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
57	54	~ttl74148_device() {}
58	55
	56	static void set_output_callback(device_t &device, ttl74148_output_delegate callback) { downcast<ttl74148_device &>(device).m_output_cb = callback; }
	57
59	58	/* must call update() after setting the inputs */
60	59	void update();
61	60
r29594	r29595
67	66
68	67	protected:
69	68	// device-level overrides
70		virtual void device_config_complete();
71	69	virtual void device_start();
72	70	virtual void device_reset();
73	71	private:
74	72	// internal state
	73	ttl74148_output_delegate m_output_cb;
75	74
76	75	/* inputs */
77	76	int m_input_lines[8]; /* pins 1-4,10-13 */
r29594	r29595
90	89
91	90	extern const device_type TTL74148;
92	91
93		#define MCFG_74148_ADD(_tag, _config) \
94		MCFG_DEVICE_ADD(_tag, TTL74148, 0) \
95		MCFG_DEVICE_CONFIG(_config)
96	92
	93	#define MCFG_74148_OUTPUT_CB(_class, _method) \
	94	ttl74148_device::set_output_callback(*device, ttl74148_output_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
	95
	96
97	97	#endif

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team