MAME SVN History

199869 Revisions

r26908 Friday 3rd January, 2014 at 02:35:49 UTC by smf
saves variables I added recently & expanded vic20 user port so that devices can be shared between vic20/c64/c128 (nw)

[src/emu/bus/vic20]	user.h
[src/mess/drivers]	vic20.c
[src/mess/includes]	vic20.h

trunk/src/emu/bus/vic20/user.h
r26907	r26908
34	34
35	35
36	36	//**************************************************************************
37		// CONSTANTS
38		//**************************************************************************
39
40		#define VIC20_USER_PORT_TAG "user"
41
42
43
44		//**************************************************************************
45	37	// INTERFACE CONFIGURATION MACROS
46	38	//**************************************************************************
47	39
r26907	r26908
67	59	#define MCFG_VIC20_USER_PORT_8_HANDLER(_devcb) \
68	60	devcb = &vic20_user_port_device::set_8_handler(*device, DEVCB2_##_devcb);
69	61
	62	#define MCFG_VIC20_USER_PORT_9_HANDLER(_devcb) \
	63	devcb = &vic20_user_port_device::set_9_handler(*device, DEVCB2_##_devcb);
	64
70	65	#define MCFG_VIC20_USER_PORT_B_HANDLER(_devcb) \
71	66	devcb = &vic20_user_port_device::set_b_handler(*device, DEVCB2_##_devcb);
72	67
r26907	r26908
119	114	template<class _Object> static devcb2_base &set_6_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_6_handler.set_callback(object); }
120	115	template<class _Object> static devcb2_base &set_7_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_7_handler.set_callback(object); }
121	116	template<class _Object> static devcb2_base &set_8_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_8_handler.set_callback(object); }
	117	template<class _Object> static devcb2_base &set_9_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_9_handler.set_callback(object); }
122	118	template<class _Object> static devcb2_base &set_b_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_b_handler.set_callback(object); }
123	119	template<class _Object> static devcb2_base &set_c_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_c_handler.set_callback(object); }
124	120	template<class _Object> static devcb2_base &set_d_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_d_handler.set_callback(object); }
r26907	r26908
131	127	template<class _Object> static devcb2_base &set_m_handler(device_t &device, _Object object) { return downcast<vic20_user_port_device &>(device).m_m_handler.set_callback(object); }
132	128
133	129	// computer interface
	130	DECLARE_WRITE_LINE_MEMBER( write_3 );
	131	DECLARE_WRITE_LINE_MEMBER( write_4 );
	132	DECLARE_WRITE_LINE_MEMBER( write_5 );
	133	DECLARE_WRITE_LINE_MEMBER( write_6 );
134	134	DECLARE_WRITE_LINE_MEMBER( write_7 );
	135	DECLARE_WRITE_LINE_MEMBER( write_8 );
135	136	DECLARE_WRITE_LINE_MEMBER( write_9 );
136	137	DECLARE_WRITE_LINE_MEMBER( write_b );
137	138	DECLARE_WRITE_LINE_MEMBER( write_c );
r26907	r26908
151	152	devcb2_write_line m_6_handler;
152	153	devcb2_write_line m_7_handler;
153	154	devcb2_write_line m_8_handler;
	155	devcb2_write_line m_9_handler;
154	156	devcb2_write_line m_b_handler;
155	157	devcb2_write_line m_c_handler;
156	158	devcb2_write_line m_d_handler;
r26907	r26908
180	182	device_vic20_user_port_interface(const machine_config &mconfig, device_t &device);
181	183	virtual ~device_vic20_user_port_interface();
182	184
	185	DECLARE_WRITE_LINE_MEMBER( write_3 ) {}
	186	DECLARE_WRITE_LINE_MEMBER( write_4 ) {}
	187	DECLARE_WRITE_LINE_MEMBER( write_5 ) {}
	188	DECLARE_WRITE_LINE_MEMBER( write_6 ) {}
183	189	DECLARE_WRITE_LINE_MEMBER( write_7 ) {}
	190	DECLARE_WRITE_LINE_MEMBER( write_8 ) {}
184	191	DECLARE_WRITE_LINE_MEMBER( write_9 ) {}
185	192	DECLARE_WRITE_LINE_MEMBER( write_b ) {}
186	193	DECLARE_WRITE_LINE_MEMBER( write_c ) {}

trunk/src/mess/drivers/vic20.c
r26907	r26908
591	591
592	592	// state saving
593	593	save_item(NAME(m_key_col));
	594	save_item(NAME(m_light_pen));
	595	save_item(NAME(m_user_joy0));
	596	save_item(NAME(m_user_joy1));
	597	save_item(NAME(m_user_joy2));
	598	save_item(NAME(m_user_light_pen));
	599	save_item(NAME(m_user_cassette_switch));
594	600	}
595	601
596	602

trunk/src/mess/includes/vic20.h
r26907	r26908
27	27	#define IEC_TAG "iec"
28	28	#define SCREEN_TAG "screen"
29	29	#define CONTROL1_TAG "joy1"
	30	#define VIC20_USER_PORT_TAG "user"
30	31
31	32	class vic20_state : public driver_device
32	33	{
r26907	r26908
117	118	DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_vc20 );
118	119	// keyboard state
119	120	int m_key_col;
	121	int m_light_pen;
	122	int m_user_joy0;
	123	int m_user_joy1;
	124	int m_user_joy2;
	125	int m_user_light_pen;
	126	int m_user_cassette_switch;
120	127
121	128	enum
122	129	{
r26907	r26908
151	158	IO2 = 6,
152	159	IO3 = 7
153	160	};
154
155		int m_light_pen;
156		int m_user_joy0;
157		int m_user_joy1;
158		int m_user_joy2;
159		int m_user_light_pen;
160		int m_user_cassette_switch;
161	161	};
162	162
163	163	#endif

199869 Revisions