Previous

199869 Revisions

Next

r20769 Wednesday 6th February, 2013 at 14:34:13 UTC by Curt Coder
(MESS) devcb2 conversions. (nw)

[src/emu]	emu.mak
[src/emu/machine]	ds75160a.c ds75160a.h mos6529.c mos6529.h mos6551.c* mos6551.h*
[src/mess/drivers]	c128.c c64.c cbm2.c pet2001.c plus4.c vic10.c vic20.c
[src/mess/includes]	c128.h c64.h cbm2.h plus4.h
[src/mess/machine]	petcass.c petcass.h petexp.c petexp.h superpet.c superpet.h vcs_lightpen.c vcsctrl.c vcsctrl.h

trunk/src/emu/emu.mak

r20768	r20769
226	226	$(EMUMACHINE)/microtch.o    \
227	227	$(EMUMACHINE)/mos6526.o     \
228	228	$(EMUMACHINE)/mos6529.o     \
	229	$(EMUMACHINE)/mos6551.o     \
229	230	$(EMUMACHINE)/msm5832.o     \
230	231	$(EMUMACHINE)/msm58321.o    \
231	232	$(EMUMACHINE)/msm6242.o     \

trunk/src/emu/machine/ds75160a.c

r20768	r20769
29	29
30	30	ds75160a_device::ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
31	31	: device_t(mconfig, DS75160A, "DS75160A", tag, owner, clock),
	32	m_read(*this),
	33	m_write(*this),
32	34	m_data(0xff),
33	35	m_te(0),
34	36	m_pe(0)
r20768	r20769
37	39
38	40
39	41	//-------------------------------------------------
40		//  device_config_complete - perform any
41		//  operations now that the configuration is
42		//  complete
43		//-------------------------------------------------
44
45		void ds75160a_device::device_config_complete()
46		{
47		// inherit a copy of the static data
48		const ds75160a_interface *intf = reinterpret_cast<const ds75160a_interface *>(static_config());
49		if (intf != NULL)
50		*static_cast<ds75160a_interface *>(this) = *intf;
51
52		// or initialize to defaults if none provided
53		else
54		{
55		memset(&m_in_bus_cb, 0, sizeof(m_in_bus_cb));
56		memset(&m_out_bus_cb, 0, sizeof(m_out_bus_cb));
57		}
58		}
59
60
61		//-------------------------------------------------
62	42	//  device_start - device-specific startup
63	43	//-------------------------------------------------
64	44
65	45	void ds75160a_device::device_start()
66	46	{
67	47	// resolve callbacks
68		m_in_bus_func.resolve(m_in_bus_cb, *this);
69		m_out_bus_func.resolve(m_out_bus_cb, *this);
	48	m_read.resolve_safe(0);
	49	m_write.resolve_safe();
70	50
71	51	// register for state saving
72	52	save_item(NAME(m_data));
r20768	r20769
85	65
86	66	if (!m_te)
87	67	{
88		data = m_in_bus_func(0);
	68	data = m_read(0);
89	69	}
90	70
91	71	return data;
r20768	r20769
102	82
103	83	if (m_te)
104	84	{
105		m_out_bus_func(0, m_data);
	85	m_write((offs_t)0, m_data);
106	86	}
107	87	}
108	88
r20768	r20769
115	95	{
116	96	if (m_te != state)
117	97	{
118		m_out_bus_func(0, m_te ? m_data : 0xff);
	98	m_write((offs_t)0, m_te ? m_data : 0xff);
119	99	}
120	100
121	101	m_te = state;

trunk/src/emu/machine/ds75160a.h

r20768	r20769
33	33	//  INTERFACE CONFIGURATION MACROS
34	34	///*************************************************************************
35	35
36		#define MCFG_DS75160A_ADD(_tag, _config) \
	36	#define MCFG_DS75160A_ADD(_tag, _read, _write) \
37	37	MCFG_DEVICE_ADD(_tag, DS75160A, 0)  \
38		MCFG_DEVICE_CONFIG(_config)
	38	downcast<ds75160a_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
39	39
40	40
41		#define DS75160A_INTERFACE(name) \
42		const ds75160a_interface (name) =
43	41
44
45
46	42	///*************************************************************************
47	43	//  TYPE DEFINITIONS
48	44	///*************************************************************************
49	45
50		// ======================> ds75160a_interface
51
52		struct ds75160a_interface
53		{
54		devcb_read8     m_in_bus_cb;
55		devcb_write8    m_out_bus_cb;
56		};
57
58
59	46	// ======================> ds75160a_device
60	47
61		class ds75160a_device : public device_t,
62		public ds75160a_interface
	48	class ds75160a_device : public device_t
63	49	{
64	50	public:
65	51	// construction/destruction
66	52	ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
67	53
	54	template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
	55	m_read.set_callback(rd);
	56	m_write.set_callback(wr);
	57	}
	58
68	59	DECLARE_READ8_MEMBER( read );
69	60	DECLARE_WRITE8_MEMBER( write );
70	61
r20768	r20769
73	64
74	65	protected:
75	66	// device-level overrides
76		virtual void device_config_complete();
77	67	virtual void device_start();
78	68
79	69	private:
80		devcb_resolved_read8    m_in_bus_func;
81		devcb_resolved_write8   m_out_bus_func;
	70	devcb2_read8  m_read;
	71	devcb2_write8 m_write;
82	72
83	73	UINT8 m_data;
84	74

trunk/src/emu/machine/mos6551.c

r0	r20769
	1	/**********************************************************************
	2
	3	MOS Technology 6551 Asynchronous Communication Interface Adapter
	4
	5	Copyright MESS Team.
	6	Visit http://mamedev.org for licensing and usage restrictions.
	7
	8	**********************************************************************/
	9
	10	#include "mos6551.h"
	11
	12
	13
	14	//**************************************************************************
	15	//  MACROS / CONSTANTS
	16	//**************************************************************************
	17
	18	#define LOG 0
	19
	20
	21	const int mos6551_device::brg_divider[] = {
	22	0, 2304, 1536, 1048, 856, 768, 384, 192, 96, 64, 48, 32, 24, 16, 12, 6
	23	};
	24
	25
	26
	27	//**************************************************************************
	28	//  DEVICE DEFINITIONS
	29	//**************************************************************************
	30
	31	// device type definition
	32	const device_type MOS6551 = &device_creator<mos6551_device>;
	33
	34
	35
	36	//**************************************************************************
	37	//  LIVE DEVICE
	38	//**************************************************************************
	39
	40	//-------------------------------------------------
	41	//  mos6551_device - constructor
	42	//-------------------------------------------------
	43
	44	mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
	45	: device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock),
	46	device_serial_interface(mconfig, *this),
	47	m_irq_handler(*this),
	48	m_ctrl(0),
	49	m_cmd(CMD_RIE),
	50	m_st(ST_TDRE),
	51	m_ext_rxc(0)
	52	{
	53	}
	54
	55
	56	//-------------------------------------------------
	57	//  device_start - device-specific startup
	58	//-------------------------------------------------
	59
	60	void mos6551_device::device_start()
	61	{
	62	m_irq_handler.resolve_safe();
	63
	64	transmit_register_reset();
	65	receive_register_reset();
	66	}
	67
	68
	69	//-------------------------------------------------
	70	//  device_reset - device-specific reset
	71	//-------------------------------------------------
	72
	73	void mos6551_device::device_reset()
	74	{
	75	m_ctrl = 0;
	76	m_cmd = CMD_RIE;
	77
	78	update_serial();
	79	}
	80
	81
	82	//-------------------------------------------------
	83	//  tra_complete -
	84	//-------------------------------------------------
	85
	86	void mos6551_device::tra_complete()
	87	{
	88	if ((m_cmd & CMD_TC_MASK) == CMD_TC_TIE_RTS_LO)
	89	{
	90	m_st |= ST_IRQ;
	91	m_irq_handler(ASSERT_LINE);
	92	}
	93
	94	if (!(m_st & ST_TDRE))
	95	{
	96	transmit_register_setup(m_tdr);
	97	m_st |= ST_TDRE;
	98	}
	99	}
	100
	101
	102	//-------------------------------------------------
	103	//  rcv_complete -
	104	//-------------------------------------------------
	105
	106	void mos6551_device::rcv_complete()
	107	{
	108	if (m_st & ST_RDRF)
	109	{
	110	m_st |= ST_OR;
	111	}
	112	else
	113	{
	114	m_st |= ST_RDRF;
	115
	116	if (!(m_cmd & CMD_RIE))
	117	{
	118	m_st |= ST_IRQ;
	119	m_irq_handler(ASSERT_LINE);
	120	}
	121	}
	122	}
	123
	124
	125	//-------------------------------------------------
	126	//  input_callback -
	127	//-------------------------------------------------
	128
	129	void mos6551_device::input_callback(UINT8 state)
	130	{
	131	m_input_state = state;
	132	}
	133
	134
	135	//-------------------------------------------------
	136	//  update_serial -
	137	//-------------------------------------------------
	138
	139	void mos6551_device::update_serial()
	140	{
	141	int brg = m_ctrl & CTRL_BRG_MASK;
	142
	143	if (brg == CTRL_BRG_16X_EXTCLK)
	144	{
	145	set_rcv_rate(m_ext_rxc / 16);
	146	set_tra_rate(m_ext_rxc / 16);
	147	}
	148	else
	149	{
	150	int baud = clock() / brg_divider[brg] / 16;
	151
	152	set_tra_rate(baud);
	153
	154	if (m_ctrl & CTRL_RXC_BRG)
	155	{
	156	set_rcv_rate(baud);
	157	}
	158	else
	159	{
	160	set_rcv_rate(m_ext_rxc / 16);
	161	}
	162
	163	int num_data_bits = 8;
	164	int stop_bit_count = 1;
	165	int parity_code = SERIAL_PARITY_NONE;
	166
	167	switch (m_ctrl & CTRL_WL_MASK)
	168	{
	169	case CTRL_WL_8: num_data_bits = 8; break;
	170	case CTRL_WL_7: num_data_bits = 7; break;
	171	case CTRL_WL_6: num_data_bits = 6; break;
	172	case CTRL_WL_5: num_data_bits = 5; break;
	173	}
	174
	175	set_data_frame(num_data_bits, stop_bit_count, parity_code);
	176	}
	177
	178	if (m_cmd & CMD_DTR)
	179	m_connection_state |= SERIAL_STATE_DTR;
	180	else
	181	m_connection_state &= ~SERIAL_STATE_DTR;
	182
	183	if ((m_cmd & CMD_TC_MASK) == CMD_TC_RTS_HI)
	184	m_connection_state &= ~SERIAL_STATE_RTS;
	185	else
	186	m_connection_state |= SERIAL_STATE_RTS;
	187
	188	serial_connection_out();
	189	}
	190
	191
	192	//-------------------------------------------------
	193	//  read -
	194	//-------------------------------------------------
	195
	196	READ8_MEMBER( mos6551_device::read )
	197	{
	198	UINT8 data = 0;
	199
	200	switch (offset & 0x03)
	201	{
	202	case 0:
	203	if (is_receive_register_full())
	204	{
	205	receive_register_extract();
	206	data = get_received_char();
	207	}
	208
	209	m_st &= ~(ST_RDRF | ST_OR | ST_FE | ST_PE);
	210	break;
	211
	212	case 1:
	213	data = m_st;
	214	m_st &= ~ST_IRQ;
	215	m_irq_handler(CLEAR_LINE);
	216	break;
	217
	218	case 2:
	219	data = m_cmd;
	220	break;
	221
	222	case 3:
	223	data = m_ctrl;
	224	break;
	225	}
	226
	227	return data;
	228	}
	229
	230
	231	//-------------------------------------------------
	232	//  write -
	233	//-------------------------------------------------
	234
	235	WRITE8_MEMBER( mos6551_device::write )
	236	{
	237	switch (offset & 0x03)
	238	{
	239	case 0:
	240	m_tdr = data;
	241	m_st &= ~ST_TDRE;
	242
	243	if (is_transmit_register_empty())
	244	{
	245	transmit_register_setup(m_tdr);
	246	m_st |= ST_TDRE;
	247	}
	248	break;
	249
	250	case 1:
	251	// programmed reset
	252	m_cmd = (m_cmd & 0xe0) | CMD_RIE;
	253	m_st &= ~ST_OR;
	254	update_serial();
	255	break;
	256
	257	case 2:
	258	m_cmd = data;
	259	update_serial();
	260	break;
	261
	262	case 3:
	263	m_ctrl = data;
	264	update_serial();
	265	break;
	266	}
	267	}
	268
	269
	270	//-------------------------------------------------
	271	//  set_rxc - set external receiver clock
	272	//-------------------------------------------------
	273
	274	void mos6551_device::set_rxc(int clock)
	275	{
	276	m_ext_rxc = clock;
	277	}

Property changes on: trunk/src/emu/machine/mos6551.c

Added: svn:mime-type    + text/plain Added: svn:eol-style    + native

trunk/src/emu/machine/mos6551.h

r0	r20769
	1	/**********************************************************************
	2
	3	MOS Technology 6551 Asynchronous Communication Interface Adapter
	4
	5	Copyright MESS Team.
	6	Visit http://mamedev.org for licensing and usage restrictions.
	7
	8	**********************************************************************
	9	_____   _____
	10	GND   1 |*    \_/     | 28  R/_W
	11	CS0   2 |             | 27  phi2
	12	_CS1   3 |             | 26  _IRQ
	13	_RES   4 |             | 25  DB7
	14	RxC   5 |             | 24  DB6
	15	XTAL1   6 |             | 23  DB5
	16	XTAL2   7 |   MOS6551   | 22  DB4
	17	_RTS   8 |             | 21  DB3
	18	_CTS   9 |             | 20  DB2
	19	TxD  10 |             | 19  DB1
	20	_DTR  11 |             | 18  DB0
	21	RxD  12 |             | 17  _DBR
	22	RS0  13 |             | 16  _DCD
	23	RS1  14 |_____________| 15  Vcc
	24
	25	**********************************************************************/
	26
	27	#pragma once
	28
	29	#ifndef __MOS6551__
	30	#define __MOS6551__
	31
	32	#include "emu.h"
	33
	34
	35
	36	//**************************************************************************
	37	//  INTERFACE CONFIGURATION MACROS
	38	//**************************************************************************
	39
	40	#define MCFG_MOS6551_ADD(_tag, _clock, _irq) \
	41	MCFG_DEVICE_ADD(_tag, MOS6551, _clock) \
	42	devcb = &mos6551_device::set_irq_handler(*device, DEVCB2_##_irq);
	43
	44
	45
	46	//**************************************************************************
	47	//  TYPE DEFINITIONS
	48	//**************************************************************************
	49
	50	// ======================> mos6551_device
	51
	52	class mos6551_device :  public device_t,
	53	public device_serial_interface
	54	{
	55	public:
	56	// construction/destruction
	57	mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
	58
	59	// static configuration helpers
	60	template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<mos6551_device &>(device).m_irq_handler.set_callback(object); }
	61
	62	DECLARE_READ8_MEMBER( read );
	63	DECLARE_WRITE8_MEMBER( write );
	64
	65	void set_rxc(int clock);
	66
	67	protected:
	68	// device-level overrides
	69	virtual void device_start();
	70	virtual void device_reset();
	71
	72	// device_serial_interface overrides
	73	virtual void tra_complete();
	74	virtual void rcv_complete();
	75	virtual void input_callback(UINT8 state);
	76
	77	enum
	78	{
	79	CTRL_BRG_16X_EXTCLK = 0,
	80	CTRL_BRG_50,
	81	CTRL_BRG_75,
	82	CTRL_BRG_109_92,
	83	CTRL_BRG_134_58,
	84	CTRL_BRG_150,
	85	CTRL_BRG_300,
	86	CTRL_BRG_600,
	87	CTRL_BRG_1200,
	88	CTRL_BRG_1800,
	89	CTRL_BRG_2400,
	90	CTRL_BRG_3600,
	91	CTRL_BRG_4800,
	92	CTRL_BRG_7200,
	93	CTRL_BRG_9600,
	94	CTRL_BRG_19200,
	95	CTRL_BRG_MASK = 0x0f,
	96
	97	CTRL_RXC_EXT = 0x00,
	98	CTRL_RXC_BRG = 0x10,
	99	CTRL_RXC_MASK = 0x10,
	100
	101	CTRL_WL_8 = 0x00,
	102	CTRL_WL_7 = 0x20,
	103	CTRL_WL_6 = 0x40,
	104	CTRL_WL_5 = 0x60,
	105	CTRL_WL_MASK = 0x60,
	106
	107	CTRL_SB_1 = 0x00,
	108	CTRL_SB_2 = 0x80,
	109	CTRL_SB_MASK = 0x80
	110	};
	111
	112	enum
	113	{
	114	CMD_DTR = 0x01,
	115
	116	CMD_RIE = 0x02,
	117
	118	CMD_TC_RTS_HI = 0x00,
	119	CMD_TC_TIE_RTS_LO = 0x04,
	120	CMD_TC_RTS_LO = 0x08,
	121	CMD_TC_BRK = 0x0c,
	122	CMD_TC_MASK = 0x0c,
	123
	124	CMD_ECHO = 0x10,
	125
	126	CMD_PARITY = 0x20,
	127	CMD_PARITY_ODD = 0x00,
	128	CMD_PARITY_EVEN = 0x40,
	129	CMD_PARITY_MARK = 0x80,
	130	CMD_PARITY_SPACE = 0xc0,
	131	CMD_PARITY_MASK = 0xc0
	132	};
	133
	134	enum
	135	{
	136	ST_PE = 0x01,
	137	ST_FE = 0x02,
	138	ST_OR = 0x04,
	139	ST_RDRF = 0x08,
	140	ST_TDRE = 0x10,
	141	ST_DCD = 0x20,
	142	ST_DSR = 0x40,
	143	ST_IRQ = 0x80
	144	};
	145
	146	void update_serial();
	147
	148	devcb2_write_line m_irq_handler;
	149
	150	UINT8 m_ctrl;
	151	UINT8 m_cmd;
	152	UINT8 m_st;
	153	UINT8 m_tdr;
	154
	155	int m_ext_rxc;
	156
	157	static const int brg_divider[16];
	158	};
	159
	160
	161	// device type definition
	162	extern const device_type MOS6551;
	163
	164
	165
	166	#endif

Property changes on: trunk/src/emu/machine/mos6551.h

Added: svn:mime-type    + text/plain Added: svn:eol-style    + native

trunk/src/emu/machine/mos6529.c

r20768	r20769
20	20
21	21
22	22	//**************************************************************************
23		//  LIVE DEVICE
	23	//  DEVICE DEFINITIONS
24	24	//**************************************************************************
25	25
26	26	// device type definition
27	27	const device_type MOS6529 = &device_creator<mos6529_device>;
28	28
29		//-------------------------------------------------
30		//  mos6529_device - constructor
31		//-------------------------------------------------
32	29
33		mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
34		: device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock)
35		{
36		}
37	30
	31	//**************************************************************************
	32	//  LIVE DEVICE
	33	//**************************************************************************
38	34
39	35	//-------------------------------------------------
40		//  device_config_complete - perform any
41		//  operations now that the configuration is
42		//  complete
	36	//  mos6529_device - constructor
43	37	//-------------------------------------------------
44	38
45		void mos6529_device::device_config_complete()
	39	mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
	40	: device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock),
	41	m_read_port(*this),
	42	m_write_port(*this)
46	43	{
47		// inherit a copy of the static data
48		const mos6529_interface *intf = reinterpret_cast<const mos6529_interface *>(static_config());
49		if (intf != NULL)
50		*static_cast<mos6529_interface *>(this) = *intf;
51
52		// or initialize to defaults if none provided
53		else
54		{
55		memset(&m_in_p_cb, 0, sizeof(m_in_p_cb));
56		memset(&m_out_p_cb, 0, sizeof(m_out_p_cb));
57		}
58	44	}
59	45
60	46
r20768	r20769
65	51	void mos6529_device::device_start()
66	52	{
67	53	// resolve callbacks
68		m_in_p_func.resolve(m_in_p_cb, *this);
69		m_out_p_func.resolve(m_out_p_cb, *this);
	54	m_read_port.resolve_safe(0);
	55	m_write_port.resolve_safe();
70	56	}
71	57
72	58
r20768	r20769
76	62
77	63	READ8_MEMBER( mos6529_device::read )
78	64	{
79		return m_in_p_func(0);
	65	return m_read_port(0);
80	66	}
81	67
82	68
r20768	r20769
86	72
87	73	WRITE8_MEMBER( mos6529_device::write )
88	74	{
89		m_out_p_func(0, data);
	75	m_write_port((offs_t)0, data);
90	76	}

trunk/src/emu/machine/mos6529.h

r20768	r20769
33	33	//  INTERFACE CONFIGURATION MACROS
34	34	//**************************************************************************
35	35
36		#define MCFG_MOS6529_ADD(_tag, _config) \
37		MCFG_DEVICE_ADD(_tag, MOS6529, 0)   \
38		MCFG_DEVICE_CONFIG(_config)
	36	#define MCFG_MOS6529_ADD(_tag, _read, _write) \
	37	MCFG_DEVICE_ADD(_tag, MOS6529, 0) \
	38	downcast<mos6529_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
39	39
40		#define MOS6529_INTERFACE(name) \
41		const mos6529_interface (name) =
42	40
43	41
44
45	42	//**************************************************************************
46	43	//  TYPE DEFINITIONS
47	44	//**************************************************************************
48	45
49		// ======================> mos6529_interface
50
51		struct mos6529_interface
52		{
53		devcb_read8             m_in_p_cb;
54		devcb_write8            m_out_p_cb;
55		};
56
57
58	46	// ======================> mos6529_device
59	47
60		class mos6529_device :  public device_t,
61		public mos6529_interface
	48	class mos6529_device :  public device_t
62	49	{
63	50	public:
64	51	// construction/destruction
65	52	mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
66	53
	54	template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
	55	m_read_port.set_callback(rd);
	56	m_write_port.set_callback(wr);
	57	}
	58
67	59	DECLARE_READ8_MEMBER( read );
68	60	DECLARE_WRITE8_MEMBER( write );
69	61
70	62	protected:
71	63	// device-level overrides
72		virtual void device_config_complete();
73	64	virtual void device_start();
74	65
75	66	private:
76		devcb_resolved_read8        m_in_p_func;
77		devcb_resolved_write8       m_out_p_func;
	67	devcb2_read8  m_read_port;
	68	devcb2_write8 m_write_port;
78	69	};
79	70
80	71

trunk/src/mess/machine/petcass.c

r20768	r20769
53	53	//-------------------------------------------------
54	54
55	55	pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
56		device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock),
57		device_slot_interface(mconfig, *this)
	56	device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock),
	57	device_slot_interface(mconfig, *this),
	58	m_read_handler(*this)
58	59	{
59	60	}
60	61
r20768	r20769
69	70
70	71
71	72	//-------------------------------------------------
72		//  device_config_complete - perform any
73		//  operations now that the configuration is
74		//  complete
75		//-------------------------------------------------
76
77		void pet_datassette_port_device::device_config_complete()
78		{
79		// inherit a copy of the static data
80		const pet_datassette_port_interface *intf = reinterpret_cast<const pet_datassette_port_interface *>(static_config());
81		if (intf != NULL)
82		{
83		*static_cast<pet_datassette_port_interface *>(this) = *intf;
84		}
85
86		// or initialize to defaults if none provided
87		else
88		{
89		memset(&m_out_read_cb, 0, sizeof(m_out_read_cb));
90		}
91		}
92
93
94		//-------------------------------------------------
95	73	//  device_start - device-specific startup
96	74	//-------------------------------------------------
97	75
r20768	r20769
100	78	m_cart = dynamic_cast<device_pet_datassette_port_interface *>(get_card_device());
101	79
102	80	// resolve callbacks
103		m_out_read_func.resolve(m_out_read_cb, *this);
	81	m_read_handler.resolve_safe();
104	82	}
105	83
106	84
r20768	r20769
109	87	READ_LINE_MEMBER( pet_datassette_port_device::sense_r ) { int state = 1; if (m_cart != NULL) state = m_cart->datassette_sense(); return state; }
110	88	WRITE_LINE_MEMBER( pet_datassette_port_device::motor_w ) { if (m_cart != NULL) m_cart->datassette_motor(state); }
111	89
112		WRITE_LINE_MEMBER( pet_datassette_port_device::read_w ) { m_out_read_func(state); }
	90	WRITE_LINE_MEMBER( pet_datassette_port_device::read_w ) { m_read_handler(state); }

trunk/src/mess/machine/petcass.h

r20768	r20769
38	38	//  INTERFACE CONFIGURATION MACROS
39	39	//**************************************************************************
40	40
41		#define PET_DATASSETTE_PORT_INTERFACE(_name) \
42		const pet_datassette_port_interface (_name) =
43
44
45		#define MCFG_PET_DATASSETTE_PORT_ADD(_tag, _config, _slot_intf, _def_slot, _def_inp) \
	41	#define MCFG_PET_DATASSETTE_PORT_ADD(_tag, _slot_intf, _def_slot, _def_inp, _devcb) \
46	42	MCFG_DEVICE_ADD(_tag, PET_DATASSETTE_PORT, 0) \
47		MCFG_DEVICE_CONFIG(_config) \
48		MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false)
	43	MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \
	44	devcb = &pet_datassette_port_device::set_read_handler(*device, DEVCB2_##_devcb);
49	45
50	46
51	47
r20768	r20769
53	49	//  TYPE DEFINITIONS
54	50	//**************************************************************************
55	51
56		// ======================> pet_datassette_port_interface
57
58		struct pet_datassette_port_interface
59		{
60		devcb_write_line    m_out_read_cb;
61		};
62
63
64	52	// ======================> pet_datassette_port_device
65	53
66	54	class device_pet_datassette_port_interface;
67	55
68	56	class pet_datassette_port_device : public device_t,
69		public pet_datassette_port_interface,
70	57	public device_slot_interface
71	58	{
72	59	public:
r20768	r20769
74	61	pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
75	62	virtual ~pet_datassette_port_device();
76	63
	64	// static configuration helpers
	65	template<class _Object> static devcb2_base &set_read_handler(device_t &device, _Object object) { return downcast<pet_datassette_port_device &>(device).m_read_handler.set_callback(object); }
	66
77	67	// computer interface
78	68	DECLARE_READ_LINE_MEMBER( read );
79	69	DECLARE_WRITE_LINE_MEMBER( write );
r20768	r20769
85	75
86	76	protected:
87	77	// device-level overrides
88		virtual void device_config_complete();
89	78	virtual void device_start();
90	79
91		devcb_resolved_write_line   m_out_read_func;
	80	devcb2_write_line m_read_handler;
92	81
93	82	device_pet_datassette_port_interface *m_cart;
94	83	};

trunk/src/mess/machine/vcs_lightpen.c

r20768	r20769
21	21	INPUT_CHANGED_MEMBER( vcs_lightpen_device::trigger )
22	22	{
23	23	// TODO trigger timer at correct screen position
	24	m_port->trigger_w(newval);
24	25	}
25	26
26	27
r20768	r20769
30	31	PORT_BIT( 0xdf, IP_ACTIVE_LOW, IPT_UNUSED )
31	32
32	33	PORT_START("LIGHTX")
33		PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X) PORT_NAME("Lightpen X Axis") PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1)
	34	PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(15)
34	35
35	36	PORT_START("LIGHTY")
36		PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y) PORT_NAME("Lightpen Y Axis") PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1)
	37	PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(15)
37	38	INPUT_PORTS_END
38	39
39	40

trunk/src/mess/machine/superpet.c

r20768	r20769
70	70	MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_16MHz/16)
71	71	MCFG_CPU_PROGRAM_MAP(superpet_mem)
72	72
73		MCFG_ACIA6551_ADD(M6551_TAG) // XTAL_1_8432MHz
	73	MCFG_MOS6551_ADD(M6551_TAG, XTAL_1_8432MHz, DEVWRITELINE(DEVICE_SELF, superpet_device, acia_irq_w))
74	74	MCFG_MOS6702_ADD(MOS6702_TAG, XTAL_16MHz/16)
75	75	MACHINE_CONFIG_END
76	76
r20768	r20769
384	384	{
385	385	m_slot->dma_bd_w(offset, data);
386	386	}
	387
	388
	389	//-------------------------------------------------
	390	//  acia_irq_w -
	391	//-------------------------------------------------
	392
	393	WRITE_LINE_MEMBER( superpet_device::acia_irq_w )
	394	{
	395	m_acia_irq = state;
	396
	397	//m_maincpu->set_input_line(M6809_IRQ_LINE, m_pet_irq || m_acia_irq);
	398	}

trunk/src/mess/machine/superpet.h

r20768	r20769
15	15
16	16	#include "emu.h"
17	17	#include "cpu/m6809/m6809.h"
18		#include "machine/6551acia.h"
	18	#include "machine/mos6551.h"
19	19	#include "machine/mos6702.h"
20	20	#include "machine/petexp.h"
21	21
r20768	r20769
41	41
42	42	DECLARE_READ8_MEMBER( read );
43	43	DECLARE_WRITE8_MEMBER( write );
	44	DECLARE_WRITE_LINE_MEMBER( acia_irq_w );
44	45
45	46	protected:
46	47	// device-level overrides
r20768	r20769
77	78
78	79	private:
79	80	required_device<cpu_device> m_maincpu;
80		required_device<acia6551_device> m_acia;
	81	required_device<mos6551_device> m_acia;
81	82	required_device<mos6702_device> m_dongle;
82	83	required_memory_region m_rom;
83	84	optional_shared_ptr<UINT8> m_ram;

trunk/src/mess/machine/vcsctrl.c

r20768	r20769
54	54
55	55	vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
56	56	device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock),
57		device_slot_interface(mconfig, *this)
	57	device_slot_interface(mconfig, *this),
	58	m_trigger_handler(*this)
58	59	{
59	60	}
60	61
r20768	r20769
75	76	void vcs_control_port_device::device_start()
76	77	{
77	78	m_device = dynamic_cast<device_vcs_control_port_interface *>(get_card_device());
	79
	80	m_trigger_handler.resolve_safe();
78	81	}
79	82
80	83
r20768	r20769
90	93	bool vcs_control_port_device::has_pot_x() { return exists() && m_device->has_pot_x(); }
91	94	bool vcs_control_port_device::has_pot_y() { return exists() && m_device->has_pot_y(); }
92	95
	96	void vcs_control_port_device::trigger_w(int state)
	97	{
	98	m_trigger_handler(state);
	99	}
	100
93	101	//-------------------------------------------------
94	102	//  SLOT_INTERFACE( vcs_control_port_devices )
95	103	//-------------------------------------------------

trunk/src/mess/machine/vcsctrl.h

r20768	r20769
28	28	MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false)
29	29
30	30
	31	#define MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(_devcb) \
	32	devcb = &vcs_control_port_device::set_trigger_handler(*device, DEVCB2_##_devcb);
31	33
	34
	35
32	36	//**************************************************************************
33	37	//  TYPE DEFINITIONS
34	38	//**************************************************************************
r20768	r20769
45	49	vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
46	50	virtual ~vcs_control_port_device();
47	51
	52	// static configuration helpers
	53	template<class _Object> static devcb2_base &set_trigger_handler(device_t &device, _Object object) { return downcast<vcs_control_port_device &>(device).m_trigger_handler.set_callback(object); }
	54
48	55	// computer interface
49	56
50	57	// Data returned by the joy_r methods:
r20768	r20769
72	79	bool has_pot_x();
73	80	bool has_pot_y();
74	81
	82	void trigger_w(int state);
	83
75	84	protected:
76	85	// device-level overrides
77	86	virtual void device_start();
78	87
79	88	device_vcs_control_port_interface *m_device;
	89
	90	private:
	91	devcb2_write_line m_trigger_handler;
80	92	};
81	93
82	94

trunk/src/mess/machine/petexp.c

r20768	r20769
37	37
38	38	pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
39	39	device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock),
40		device_slot_interface(mconfig, *this)
	40	device_slot_interface(mconfig, *this),
	41	m_read_dma(*this),
	42	m_write_dma(*this)
41	43	{
42	44	}
43	45
r20768	r20769
72	74
73	75
74	76	//-------------------------------------------------
75		//  device_config_complete - perform any
76		//  operations now that the configuration is
77		//  complete
78		//-------------------------------------------------
79
80		void pet_expansion_slot_device::device_config_complete()
81		{
82		// inherit a copy of the static data
83		const pet_expansion_slot_interface *intf = reinterpret_cast<const pet_expansion_slot_interface *>(static_config());
84		if (intf != NULL)
85		{
86		*static_cast<pet_expansion_slot_interface *>(this) = *intf;
87		}
88
89		// or initialize to defaults if none provided
90		else
91		{
92		memset(&m_in_dma_bd_cb, 0, sizeof(m_in_dma_bd_cb));
93		memset(&m_out_dma_bd_cb, 0, sizeof(m_out_dma_bd_cb));
94		}
95		}
96
97
98		//-------------------------------------------------
99	77	//  device_start - device-specific startup
100	78	//-------------------------------------------------
101	79
r20768	r20769
104	82	m_card = dynamic_cast<device_pet_expansion_card_interface *>(get_card_device());
105	83
106	84	// resolve callbacks
107		m_in_dma_bd_func.resolve(m_in_dma_bd_cb, *this);
108		m_out_dma_bd_func.resolve(m_out_dma_bd_cb, *this);
	85	m_read_dma.resolve_safe(0);
	86	m_write_dma.resolve_safe();
109	87	}
110	88
111	89
r20768	r20769
186	164
187	165	UINT8 pet_expansion_slot_device::dma_bd_r(offs_t offset)
188	166	{
189		return m_in_dma_bd_func(offset);
	167	return m_read_dma(offset);
190	168	}
191	169
192	170
r20768	r20769
196	174
197	175	void pet_expansion_slot_device::dma_bd_w(offs_t offset, UINT8 data)
198	176	{
199		m_out_dma_bd_func(offset, data);
	177	m_write_dma(offset, data);
200	178	}
201	179
202	180

trunk/src/mess/machine/petexp.h

r20768	r20769
30	30	//  INTERFACE CONFIGURATION MACROS
31	31	//**************************************************************************
32	32
33		#define PET_EXPANSION_INTERFACE(_name) \
34		const pet_expansion_slot_interface (_name) =
35
36
37		#define MCFG_PET_EXPANSION_SLOT_ADD(_tag, _clock, _config, _slot_intf, _def_slot, _def_inp) \
	33	#define MCFG_PET_EXPANSION_SLOT_ADD(_tag, _clock, _slot_intf, _def_slot, _def_inp) \
38	34	MCFG_DEVICE_ADD(_tag, PET_EXPANSION_SLOT, _clock) \
39		MCFG_DEVICE_CONFIG(_config) \
40	35	MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false)
41	36
42	37
	38	#define MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(_read, _write) \
	39	downcast<pet_expansion_slot_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
43	40
	41
	42
44	43	//**************************************************************************
45	44	//  TYPE DEFINITIONS
46	45	//**************************************************************************
47	46
48		// ======================> pet_expansion_slot_interface
49
50		struct pet_expansion_slot_interface
51		{
52		devcb_read8         m_in_dma_bd_cb;
53		devcb_write8        m_out_dma_bd_cb;
54		};
55
56
57	47	// ======================> pet_expansion_slot_device
58	48
59	49	class device_pet_expansion_card_interface;
60	50
61	51	class pet_expansion_slot_device : public device_t,
62		public device_slot_interface,
63		public pet_expansion_slot_interface
	52	public device_slot_interface
64	53	{
65	54	public:
66	55	// construction/destruction
67	56	pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
68	57	virtual ~pet_expansion_slot_device();
69	58
	59	template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
	60	m_read_dma.set_callback(rd);
	61	m_write_dma.set_callback(wr);
	62	}
	63
70	64	// computer interface
71	65	int norom_r(address_space &space, offs_t offset, int sel);
72	66	UINT8 read(address_space &space, offs_t offset, UINT8 data, int sel);
r20768	r20769
81	75
82	76	protected:
83	77	// device-level overrides
84		virtual void device_config_complete();
85	78	virtual void device_start();
86	79	virtual void device_reset();
87	80
88	81	device_pet_expansion_card_interface *m_card;
89	82
90		devcb_resolved_read8        m_in_dma_bd_func;
91		devcb_resolved_write8       m_out_dma_bd_func;
	83	devcb2_read8  m_read_dma;
	84	devcb2_write8 m_write_dma;
92	85	};
93	86
94	87

trunk/src/mess/includes/cbm2.h

r20768	r20769
9	9	#include "formats/cbm_snqk.h"
10	10	#include "includes/cbm.h"
11	11	#include "machine/6525tpi.h"
12		#include "machine/6551acia.h"
13	12	#include "machine/cbm2exp.h"
14	13	#include "machine/cbm2user.h"
15	14	#include "machine/cbmipt.h"
r20768	r20769
17	16	#include "machine/ds75161a.h"
18	17	#include "machine/ieee488.h"
19	18	#include "machine/mos6526.h"
	19	#include "machine/mos6551.h"
20	20	#include "machine/petcass.h"
21	21	#include "machine/pic8259.h"
22	22	#include "machine/pla.h"
r20768	r20769
104	104	m_graphics(1),
105	105	m_todclk(0),
106	106	m_tpi1_irq(CLEAR_LINE),
107		m_cass_rd(1),
108		m_user_flag(0),
	107	m_acia_irq(CLEAR_LINE),
109	108	m_user_irq(CLEAR_LINE),
110	109	m_tpi2_pa(0),
111	110	m_tpi2_pb(0)
r20768	r20769
117	116	required_device<sid6581_device> m_sid;
118	117	required_device<tpi6525_device> m_tpi1;
119	118	required_device<tpi6525_device> m_tpi2;
120		required_device<acia6551_device> m_acia;
	119	required_device<mos6551_device> m_acia;
121	120	required_device<mos6526_device> m_cia;
122	121	required_device<ds75160a_device> m_ieee1;
123	122	required_device<ds75161a_device> m_ieee2;
r20768	r20769
225	224	// interrupt state
226	225	int m_todclk;
227	226	int m_tpi1_irq;
228		int m_cass_rd;
229		int m_user_flag;
	227	int m_acia_irq;
230	228	int m_user_irq;
231	229
232	230	// keyboard state;

trunk/src/mess/includes/plus4.h

r20768	r20769
69	69	required_device<m7501_device> m_maincpu;
70	70	required_device<pls100_device> m_pla;
71	71	required_device<mos7360_device> m_ted;
72		optional_device<acia6551_device> m_acia;
	72	optional_device<mos6551_device> m_acia;
73	73	optional_device<mos6529_device> m_spi_user;
74	74	required_device<mos6529_device> m_spi_kb;
75	75	optional_device<t6721_device> m_t6721;
r20768	r20769
106	106	DECLARE_READ8_MEMBER( ted_videoram_r );
107	107
108	108	DECLARE_READ8_MEMBER( cpu_r );
109		DECLARE_READ8_MEMBER( c16_cpu_r );
110	109	DECLARE_WRITE8_MEMBER( cpu_w );
111	110
112	111	DECLARE_WRITE_LINE_MEMBER( ted_irq_w );
r20768	r20769
114	113	DECLARE_READ8_MEMBER( ted_rom_r );
115	114	DECLARE_READ8_MEMBER( ted_k_r );
116	115
117		DECLARE_READ8_MEMBER( spi_kb_r );
118	116	DECLARE_WRITE8_MEMBER( spi_kb_w );
119	117
	118	DECLARE_WRITE_LINE_MEMBER( acia_irq_w );
	119
120	120	DECLARE_READ8_MEMBER( exp_dma_r );
121	121	DECLARE_WRITE8_MEMBER( exp_dma_w );
122	122	DECLARE_WRITE_LINE_MEMBER( exp_irq_w );
r20768	r20769
153	153	};
154	154
155	155
	156	class c16_state : public plus4_state
	157	{
	158	public:
	159	c16_state(const machine_config &mconfig, device_type type, const char *tag)
	160	: plus4_state(mconfig, type, tag)
	161	{ }
156	162
	163	DECLARE_READ8_MEMBER( cpu_r );
	164	};
	165
	166
	167
157	168	#endif

trunk/src/mess/includes/c64.h

r20768	r20769
71	71	m_cia2_irq(CLEAR_LINE),
72	72	m_vic_irq(CLEAR_LINE),
73	73	m_exp_irq(CLEAR_LINE),
74		m_exp_nmi(CLEAR_LINE),
75		m_cass_rd(1),
76		m_iec_srq(1)
	74	m_exp_nmi(CLEAR_LINE)
77	75	{ }
78	76
79	77	required_device<m6510_device> m_maincpu;
r20768	r20769
134	132	DECLARE_READ8_MEMBER( cpu_r );
135	133	DECLARE_WRITE8_MEMBER( cpu_w );
136	134
137		DECLARE_WRITE_LINE_MEMBER( tape_read_w );
138
139		DECLARE_WRITE_LINE_MEMBER( iec_srq_w );
140
141	135	DECLARE_READ8_MEMBER( exp_dma_r );
142	136	DECLARE_WRITE8_MEMBER( exp_dma_w );
143	137	DECLARE_WRITE_LINE_MEMBER( exp_irq_w );
r20768	r20769
161	155	int m_exp_irq;
162	156	int m_exp_nmi;
163	157	int m_exp_dma;
164		int m_cass_rd;
165		int m_iec_srq;
166	158	};
167	159
168	160

trunk/src/mess/includes/c128.h

r20768	r20769
181	181	DECLARE_READ8_MEMBER( cpu_r );
182	182	DECLARE_WRITE8_MEMBER( cpu_w );
183	183
184		DECLARE_WRITE_LINE_MEMBER( tape_read_w );
185
186	184	DECLARE_WRITE_LINE_MEMBER( iec_srq_w );
187	185	DECLARE_WRITE_LINE_MEMBER( iec_data_w );
188	186

trunk/src/mess/drivers/c128.c

r20768	r20769
50	50
51	51	m_subcpu->set_input_line(M8502_IRQ_LINE, irq);
52	52	m_subcpu->set_input_line(INPUT_LINE_NMI, nmi);
53
54		int flag = m_cass_rd && m_iec_srq;
55
56		m_cia1->flag_w(flag);
57	53	}
58	54
59	55
r20768	r20769
1328	1324
1329	1325
1330	1326	//-------------------------------------------------
1331		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
1332		//-------------------------------------------------
1333
1334		WRITE_LINE_MEMBER( c128_state::tape_read_w )
1335		{
1336		m_cass_rd = state;
1337
1338		check_interrupts();
1339		}
1340
1341		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
1342		{
1343		DEVCB_DRIVER_LINE_MEMBER(c128_state, tape_read_w),
1344		};
1345
1346
1347		//-------------------------------------------------
1348	1327	//  C64_EXPANSION_INTERFACE( expansion_intf )
1349	1328	//-------------------------------------------------
1350	1329
r20768	r20769
1462	1441	save_item(NAME(m_exp_irq));
1463	1442	save_item(NAME(m_exp_nmi));
1464	1443	save_item(NAME(m_exp_dma));
1465		save_item(NAME(m_cass_rd));
1466		save_item(NAME(m_iec_srq));
1467	1444	save_item(NAME(m_vic_k));
1468	1445	save_item(NAME(m_caps_lock));
1469	1446	}
r20768	r20769
1531	1508	MCFG_MOS6526_ADD(MOS6526_1_TAG, VIC6567_CLOCK, 60, cia1_intf)
1532	1509	MCFG_MOS6526_ADD(MOS6526_2_TAG, VIC6567_CLOCK, 60, cia2_intf)
1533	1510	MCFG_QUICKLOAD_ADD("quickload", cbm_c64, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
1534		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c1530", NULL)
	1511	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
1535	1512	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	1513	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS8564_TAG, mos8564_device, lp_w))
1536	1514	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
1537	1515	MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6567_CLOCK, expansion_intf, c64_expansion_cards, NULL, NULL)
1538	1516	MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, user_intf, c64_user_port_cards, NULL, NULL)
1539	1517
1540	1518	// software list
1541	1519	MCFG_SOFTWARE_LIST_ADD("cart_list_vic10", "vic10")
1542		MCFG_SOFTWARE_LIST_FILTER("cart_list_vic10", "NTSC")
1543	1520	MCFG_SOFTWARE_LIST_ADD("cart_list_c64", "c64_cart")
1544		MCFG_SOFTWARE_LIST_FILTER("cart_list_c64", "NTSC")
1545		MCFG_SOFTWARE_LIST_ADD("cart_list_c128", "c128_cart")
1546		MCFG_SOFTWARE_LIST_FILTER("cart_list_c128", "NTSC")
1547		MCFG_SOFTWARE_LIST_ADD("disk_list_c64", "c64_flop")
1548		MCFG_SOFTWARE_LIST_FILTER("disk_list_c64", "NTSC")
1549		MCFG_SOFTWARE_LIST_ADD("disk_list_c128", "c128_flop")
1550		MCFG_SOFTWARE_LIST_FILTER("disk_list_c128", "NTSC")
	1521	MCFG_SOFTWARE_LIST_ADD("cart_list", "c128_cart")
	1522	MCFG_SOFTWARE_LIST_ADD("cass_list_c64", "c64_cass")
	1523	MCFG_SOFTWARE_LIST_ADD("flop_list_c64", "c64_flop")
	1524	MCFG_SOFTWARE_LIST_ADD("flop_list", "c128_flop")
1551	1525	MCFG_SOFTWARE_LIST_ADD("from_list", "c128_rom")
	1526	MCFG_SOFTWARE_LIST_FILTER("cart_list_vic10", "NTSC")
	1527	MCFG_SOFTWARE_LIST_FILTER("cart_list_c64", "NTSC")
	1528	MCFG_SOFTWARE_LIST_FILTER("cart_list", "NTSC")
	1529	MCFG_SOFTWARE_LIST_FILTER("cass_list_c64", "NTSC")
	1530	MCFG_SOFTWARE_LIST_FILTER("flop_list_c64", "NTSC")
	1531	MCFG_SOFTWARE_LIST_FILTER("flop_list", "NTSC")
1552	1532	MCFG_SOFTWARE_LIST_FILTER("from_list", "NTSC")
1553	1533
1554	1534	// function ROM
r20768	r20769
1635	1615	MCFG_MOS6526_ADD(MOS6526_1_TAG, VIC6569_CLOCK, 50, cia1_intf)
1636	1616	MCFG_MOS6526_ADD(MOS6526_2_TAG, VIC6569_CLOCK, 50, cia2_intf)
1637	1617	MCFG_QUICKLOAD_ADD("quickload", cbm_c64, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
1638		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c1530", NULL)
	1618	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
1639	1619	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	1620	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS8566_TAG, mos8566_device, lp_w))
1640	1621	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
1641	1622	MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, expansion_intf, c64_expansion_cards, NULL, NULL)
1642	1623	MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, user_intf, c64_user_port_cards, NULL, NULL)
1643	1624
1644	1625	// software list
1645	1626	MCFG_SOFTWARE_LIST_ADD("cart_list_vic10", "vic10")
1646		MCFG_SOFTWARE_LIST_FILTER("cart_list_vic10", "PAL")
1647	1627	MCFG_SOFTWARE_LIST_ADD("cart_list_c64", "c64_cart")
1648		MCFG_SOFTWARE_LIST_FILTER("cart_list_c64", "PAL")
1649		MCFG_SOFTWARE_LIST_ADD("cart_list_c128", "c128_cart")
1650		MCFG_SOFTWARE_LIST_FILTER("cart_list_c128", "PAL")
1651		MCFG_SOFTWARE_LIST_ADD("disk_list_c64", "c64_flop")
1652		MCFG_SOFTWARE_LIST_FILTER("disk_list_c64", "PAL")
1653		MCFG_SOFTWARE_LIST_ADD("disk_list_c128", "c128_flop")
1654		MCFG_SOFTWARE_LIST_FILTER("disk_list_c128", "PAL")
	1628	MCFG_SOFTWARE_LIST_ADD("cart_list", "c128_cart")
	1629	MCFG_SOFTWARE_LIST_ADD("cass_list_c64", "c64_cass")
	1630	MCFG_SOFTWARE_LIST_ADD("flop_list_c64", "c64_flop")
	1631	MCFG_SOFTWARE_LIST_ADD("flop_list", "c128_flop")
1655	1632	MCFG_SOFTWARE_LIST_ADD("from_list", "c128_rom")
	1633	MCFG_SOFTWARE_LIST_FILTER("cart_list_vic10", "PAL")
	1634	MCFG_SOFTWARE_LIST_FILTER("cart_list_c64", "PAL")
	1635	MCFG_SOFTWARE_LIST_FILTER("cart_list", "PAL")
	1636	MCFG_SOFTWARE_LIST_FILTER("cass_list_c64", "PAL")
	1637	MCFG_SOFTWARE_LIST_FILTER("flop_list_c64", "PAL")
	1638	MCFG_SOFTWARE_LIST_FILTER("flop_list", "PAL")
1656	1639	MCFG_SOFTWARE_LIST_FILTER("from_list", "PAL")
1657	1640
1658	1641	// function ROM

trunk/src/mess/drivers/c64.c

r20768	r20769
48	48
49	49	m_maincpu->set_input_line(M6510_IRQ_LINE, irq);
50	50	m_maincpu->set_input_line(INPUT_LINE_NMI, nmi);
51
52		int flag = m_cass_rd && m_iec_srq;
53
54		m_cia1->flag_w(flag);
55	51	}
56	52
57	53
r20768	r20769
999	995
1000	996
1001	997	//-------------------------------------------------
1002		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
1003		//-------------------------------------------------
1004
1005		WRITE_LINE_MEMBER( c64_state::tape_read_w )
1006		{
1007		m_cass_rd = state;
1008
1009		check_interrupts();
1010		}
1011
1012		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
1013		{
1014		DEVCB_DRIVER_LINE_MEMBER(c64_state, tape_read_w),
1015		};
1016
1017
1018		//-------------------------------------------------
1019	998	//  CBM_IEC_INTERFACE( iec_intf )
1020	999	//-------------------------------------------------
1021	1000
1022		WRITE_LINE_MEMBER( c64_state::iec_srq_w )
1023		{
1024		m_iec_srq = state;
1025
1026		check_interrupts();
1027		}
1028
1029	1001	static CBM_IEC_INTERFACE( iec_intf )
1030	1002	{
1031		DEVCB_DRIVER_LINE_MEMBER(c64_state, iec_srq_w),
	1003	DEVCB_DEVICE_LINE_MEMBER(MOS6526_1_TAG, mos6526_device, flag_w),
1032	1004	DEVCB_DEVICE_LINE_MEMBER(C64_USER_PORT_TAG, c64_user_port_device, atn_w),
1033	1005	DEVCB_NULL,
1034	1006	DEVCB_NULL,
r20768	r20769
1143	1115	save_item(NAME(m_exp_irq));
1144	1116	save_item(NAME(m_exp_nmi));
1145	1117	save_item(NAME(m_exp_dma));
1146		save_item(NAME(m_cass_rd));
1147		save_item(NAME(m_iec_srq));
1148	1118	}
1149	1119
1150	1120
r20768	r20769
1194	1164	MCFG_PLS100_ADD(PLA_TAG)
1195	1165	MCFG_MOS6526_ADD(MOS6526_1_TAG, VIC6567_CLOCK, 60, cia1_intf)
1196	1166	MCFG_MOS6526_ADD(MOS6526_2_TAG, VIC6567_CLOCK, 60, cia2_intf)
1197		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c1530", NULL)
	1167	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
1198	1168	MCFG_CBM_IEC_ADD(iec_intf, "c1541")
1199	1169	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	1170	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w))
1200	1171	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
1201	1172	MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6567_CLOCK, expansion_intf, c64_expansion_cards, NULL, NULL)
1202	1173	MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, user_intf, c64_user_port_cards, NULL, NULL)
r20768	r20769
1294	1265	MCFG_PLS100_ADD(PLA_TAG)
1295	1266	MCFG_MOS6526_ADD(MOS6526_1_TAG, VIC6569_CLOCK, 50, cia1_intf)
1296	1267	MCFG_MOS6526_ADD(MOS6526_2_TAG, VIC6569_CLOCK, 50, cia2_intf)
1297		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c1530", NULL)
	1268	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
1298	1269	MCFG_CBM_IEC_ADD(iec_intf, "c1541")
1299	1270	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	1271	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
1300	1272	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
1301	1273	MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, expansion_intf, c64_expansion_cards, NULL, NULL)
1302	1274	MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, user_intf, c64_user_port_cards, NULL, NULL)
r20768	r20769
1374	1346	MCFG_MOS6526_ADD(MOS6526_2_TAG, VIC6569_CLOCK, 50, cia2_intf)
1375	1347	MCFG_CBM_IEC_BUS_ADD(iec_intf)
1376	1348	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	1349	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
1377	1350	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
1378	1351	MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, VIC6569_CLOCK, expansion_intf, c64_expansion_cards, NULL, NULL)
1379	1352	MCFG_C64_USER_PORT_ADD(C64_USER_PORT_TAG, user_intf, c64_user_port_cards, NULL, NULL)

trunk/src/mess/drivers/cbm2.c

r20768	r20769
1663	1663
1664	1664
1665	1665	//-------------------------------------------------
1666		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
1667		//-------------------------------------------------
1668
1669		WRITE_LINE_MEMBER( cbm2_state::tape_read_w )
1670		{
1671		m_cass_rd = state;
1672
1673		m_cia->flag_w(m_cass_rd && m_user_flag);
1674		}
1675
1676		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
1677		{
1678		DEVCB_DRIVER_LINE_MEMBER(cbm2_state, tape_read_w)
1679		};
1680
1681
1682		//-------------------------------------------------
1683		//  DS75160A_INTERFACE( ds75160a_intf )
1684		//-------------------------------------------------
1685
1686		static DS75160A_INTERFACE( ds75160a_intf )
1687		{
1688		DEVCB_DEVICE_MEMBER(IEEE488_TAG, ieee488_device, dio_r),
1689		DEVCB_DEVICE_MEMBER(IEEE488_TAG, ieee488_device, dio_w)
1690		};
1691
1692
1693		//-------------------------------------------------
1694	1666	//  DS75161A_INTERFACE( ds75161a_intf )
1695	1667	//-------------------------------------------------
1696	1668
r20768	r20769
2012	1984	save_item(NAME(m_ntsc));
2013	1985	save_item(NAME(m_todclk));
2014	1986	save_item(NAME(m_tpi1_irq));
2015		save_item(NAME(m_cass_rd));
2016		save_item(NAME(m_user_flag));
2017	1987	save_item(NAME(m_tpi2_pa));
2018	1988	save_item(NAME(m_tpi2_pb));
2019	1989	save_item(NAME(m_cia_pa));
r20768	r20769
2132	2102	m_busy2 = 1;
2133	2103	m_graphics = 1;
2134	2104	m_tpi1_irq = CLEAR_LINE;
2135		m_cass_rd = 1;
2136	2105	m_user_irq = CLEAR_LINE;
2137	2106
2138	2107	m_maincpu->reset();
r20768	r20769
2214	2183	MCFG_PLS100_ADD(PLA2_TAG)
2215	2184	MCFG_TPI6525_ADD(MOS6525_1_TAG, p500_tpi1_intf)
2216	2185	MCFG_TPI6525_ADD(MOS6525_2_TAG, p500_tpi2_intf)
2217		MCFG_ACIA6551_ADD(MOS6551A_TAG)
	2186	MCFG_MOS6551_ADD(MOS6551A_TAG, XTAL_1_8432MHz, DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
2218	2187	MCFG_MOS6526_ADD(MOS6526_TAG, VIC6567_CLOCK, 60, cia_intf)
2219		MCFG_DS75160A_ADD(DS75160A_TAG, ds75160a_intf)
	2188	MCFG_DS75160A_ADD(DS75160A_TAG, DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
2220	2189	MCFG_DS75161A_ADD(DS75161A_TAG, ds75161a_intf)
2221	2190	MCFG_CBM_IEEE488_ADD(ieee488_intf, "c8050")
2222		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, NULL, NULL)
	2191	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
2223	2192	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	2193	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w))
2224	2194	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL)
2225	2195	MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, VIC6567_CLOCK, cbm2_expansion_cards, NULL, NULL)
2226	2196	MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, p500_user_intf, cbm2_user_port_cards, NULL, NULL)
r20768	r20769
2264	2234	MCFG_PLS100_ADD(PLA2_TAG)
2265	2235	MCFG_TPI6525_ADD(MOS6525_1_TAG, p500_tpi1_intf)
2266	2236	MCFG_TPI6525_ADD(MOS6525_2_TAG, p500_tpi2_intf)
2267		MCFG_ACIA6551_ADD(MOS6551A_TAG)
	2237	MCFG_MOS6551_ADD(MOS6551A_TAG, XTAL_1_8432MHz, DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
2268	2238	MCFG_MOS6526_ADD(MOS6526_TAG, VIC6569_CLOCK, 50, cia_intf)
2269		MCFG_DS75160A_ADD(DS75160A_TAG, ds75160a_intf)
	2239	MCFG_DS75160A_ADD(DS75160A_TAG, DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
2270	2240	MCFG_DS75161A_ADD(DS75161A_TAG, ds75161a_intf)
2271	2241	MCFG_CBM_IEEE488_ADD(ieee488_intf, "c8050")
2272		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, NULL, NULL)
	2242	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
2273	2243	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	2244	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
2274	2245	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL)
2275	2246	MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, VIC6569_CLOCK, cbm2_expansion_cards, NULL, NULL)
2276	2247	MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, p500_user_intf, cbm2_user_port_cards, NULL, NULL)
r20768	r20769
2321	2292	MCFG_PLS100_ADD(PLA1_TAG)
2322	2293	MCFG_TPI6525_ADD(MOS6525_1_TAG, tpi1_intf)
2323	2294	MCFG_TPI6525_ADD(MOS6525_2_TAG, tpi2_intf)
2324		MCFG_ACIA6551_ADD(MOS6551A_TAG)
	2295	MCFG_MOS6551_ADD(MOS6551A_TAG, XTAL_1_8432MHz, DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
2325	2296	MCFG_MOS6526_ADD(MOS6526_TAG, XTAL_18MHz/9, 60, cia_intf)
2326		MCFG_DS75160A_ADD(DS75160A_TAG, ds75160a_intf)
	2297	MCFG_DS75160A_ADD(DS75160A_TAG, DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
2327	2298	MCFG_DS75161A_ADD(DS75161A_TAG, ds75161a_intf)
2328	2299	MCFG_CBM_IEEE488_ADD(ieee488_intf, "c8050")
2329		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, NULL, NULL)
	2300	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
2330	2301	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
2331	2302	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL)
2332	2303	MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL_18MHz/9, cbm2_expansion_cards, NULL, NULL)
r20768	r20769
2345	2316	//  MACHINE_CONFIG( b128 )
2346	2317	//-------------------------------------------------
2347	2318
2348		static MACHINE_CONFIG_START( b128, cbm2_state )
2349		MCFG_FRAGMENT_ADD(cbm2lp_ntsc)
	2319	static MACHINE_CONFIG_DERIVED( b128, cbm2lp_ntsc )
2350	2320	MCFG_FRAGMENT_ADD(128k)
2351	2321	MACHINE_CONFIG_END
2352	2322
r20768	r20769
2355	2325	//  MACHINE_CONFIG( b256 )
2356	2326	//-------------------------------------------------
2357	2327
2358		static MACHINE_CONFIG_START( b256, cbm2_state )
2359		MCFG_FRAGMENT_ADD(cbm2lp_ntsc)
	2328	static MACHINE_CONFIG_DERIVED( b256, cbm2lp_ntsc )
2360	2329	MCFG_FRAGMENT_ADD(256k)
2361	2330	MACHINE_CONFIG_END
2362	2331
r20768	r20769
2365	2334	//  MACHINE_CONFIG( cbm2lp_pal )
2366	2335	//-------------------------------------------------
2367	2336
2368		static MACHINE_CONFIG_START( cbm2lp_pal, cbm2_state )
2369		MCFG_FRAGMENT_ADD(cbm2lp_ntsc)
2370
	2337	static MACHINE_CONFIG_DERIVED( cbm2lp_pal, cbm2lp_ntsc )
2371	2338	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal)
2372	2339
2373	2340	MCFG_DEVICE_REMOVE(MOS6526_TAG)
r20768	r20769
2379	2346	//  MACHINE_CONFIG( cbm610 )
2380	2347	//-------------------------------------------------
2381	2348
2382		static MACHINE_CONFIG_START( cbm610, cbm2_state )
2383		MCFG_FRAGMENT_ADD(cbm2lp_pal)
	2349	static MACHINE_CONFIG_DERIVED( cbm610, cbm2lp_pal )
2384	2350	MCFG_FRAGMENT_ADD(128k)
2385	2351	MACHINE_CONFIG_END
2386	2352
r20768	r20769
2389	2355	//  MACHINE_CONFIG( cbm620 )
2390	2356	//-------------------------------------------------
2391	2357
2392		static MACHINE_CONFIG_START( cbm620, cbm2_state )
2393		MCFG_FRAGMENT_ADD(cbm2lp_pal)
	2358	static MACHINE_CONFIG_DERIVED( cbm620, cbm2lp_pal )
2394	2359	MCFG_FRAGMENT_ADD(256k)
2395	2360	MACHINE_CONFIG_END
2396	2361
r20768	r20769
2399	2364	//  MACHINE_CONFIG( cbm2hp_ntsc )
2400	2365	//-------------------------------------------------
2401	2366
2402		static MACHINE_CONFIG_START( cbm2hp_ntsc, cbm2hp_state )
2403		MCFG_FRAGMENT_ADD(cbm2lp_ntsc)
2404
2405		// devices
	2367	static MACHINE_CONFIG_DERIVED_CLASS( cbm2hp_ntsc, cbm2lp_ntsc, cbm2hp_state )
2406	2368	MCFG_DEVICE_REMOVE(MOS6525_2_TAG)
2407	2369	MCFG_TPI6525_ADD(MOS6525_2_TAG, hp_tpi2_intf)
2408	2370	MACHINE_CONFIG_END
r20768	r20769
2412	2374	//  MACHINE_CONFIG( b128hp )
2413	2375	//-------------------------------------------------
2414	2376
2415		static MACHINE_CONFIG_START( b128hp, cbm2hp_state )
2416		MCFG_FRAGMENT_ADD(cbm2hp_ntsc)
	2377	static MACHINE_CONFIG_DERIVED( b128hp, cbm2hp_ntsc )
2417	2378	MCFG_FRAGMENT_ADD(128k)
2418	2379	MACHINE_CONFIG_END
2419	2380
r20768	r20769
2422	2383	//  MACHINE_CONFIG( b256hp )
2423	2384	//-------------------------------------------------
2424	2385
2425		static MACHINE_CONFIG_START( b256hp, cbm2hp_state )
2426		MCFG_FRAGMENT_ADD(cbm2hp_ntsc)
	2386	static MACHINE_CONFIG_DERIVED( b256hp, cbm2hp_ntsc )
2427	2387	MCFG_FRAGMENT_ADD(256k)
2428	2388	MACHINE_CONFIG_END
2429	2389
r20768	r20769
2432	2392	//  MACHINE_CONFIG( bx256hp )
2433	2393	//-------------------------------------------------
2434	2394
2435		static MACHINE_CONFIG_START( bx256hp, cbm2hp_state )
2436		MCFG_FRAGMENT_ADD(b256hp)
2437
	2395	static MACHINE_CONFIG_DERIVED( bx256hp, b256hp )
2438	2396	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_ntsc)
2439	2397
2440	2398	MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL_12MHz)
r20768	r20769
2451	2409	//  MACHINE_CONFIG( cbm2hp_pal )
2452	2410	//-------------------------------------------------
2453	2411
2454		static MACHINE_CONFIG_START( cbm2hp_pal, cbm2hp_state )
2455		MCFG_FRAGMENT_ADD(cbm2hp_ntsc)
2456
	2412	static MACHINE_CONFIG_DERIVED( cbm2hp_pal, cbm2hp_ntsc )
2457	2413	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal)
2458	2414
2459	2415	// devices
r20768	r20769
2469	2425	//  MACHINE_CONFIG( cbm710 )
2470	2426	//-------------------------------------------------
2471	2427
2472		static MACHINE_CONFIG_START( cbm710, cbm2hp_state )
2473		MCFG_FRAGMENT_ADD(cbm2hp_pal)
	2428	static MACHINE_CONFIG_DERIVED( cbm710, cbm2hp_pal )
2474	2429	MCFG_FRAGMENT_ADD(128k)
2475	2430	MACHINE_CONFIG_END
2476	2431
r20768	r20769
2479	2434	//  MACHINE_CONFIG( cbm720 )
2480	2435	//-------------------------------------------------
2481	2436
2482		static MACHINE_CONFIG_START( cbm720, cbm2hp_state )
2483		MCFG_FRAGMENT_ADD(cbm2hp_pal)
	2437	static MACHINE_CONFIG_DERIVED( cbm720, cbm2hp_pal )
2484	2438	MCFG_FRAGMENT_ADD(256k)
2485	2439	MACHINE_CONFIG_END
2486	2440
r20768	r20769
2489	2443	//  MACHINE_CONFIG( cbm730 )
2490	2444	//-------------------------------------------------
2491	2445
2492		static MACHINE_CONFIG_START( cbm730, cbm2hp_state )
2493		MCFG_FRAGMENT_ADD(cbm720)
2494
	2446	static MACHINE_CONFIG_DERIVED( cbm730, cbm720 )
2495	2447	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_pal)
2496	2448
2497	2449	MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL_12MHz)
r20768	r20769
2537	2489	ROM_LOAD( "906114-03.u88", 0x00, 0xf5, CRC(668c073e) SHA1(1115858bb2dc91ea9e2016ba2e23ec94239358b4) )
2538	2490	ROM_END
2539	2491
2540
2541		//-------------------------------------------------
2542		//  ROM( p500p )
2543		//-------------------------------------------------
2544
2545	2492	#define rom_p500p   rom_p500
2546	2493
2547	2494
r20768	r20769
2590	2537	ROM_LOAD( "906114-04.u18", 0x00, 0xf5, CRC(ae3ec265) SHA1(334e0bc4b2c957ecb240c051d84372f7b47efba3) )
2591	2538	ROM_END
2592	2539
	2540	#define rom_cbm610  rom_b128
	2541	#define rom_cbm620  rom_b256
2593	2542
	2543
2594	2544	//-------------------------------------------------
2595	2545	//  ROM( b256 )
2596	2546	//-------------------------------------------------
r20768	r20769
2616	2566
2617	2567
2618	2568	//-------------------------------------------------
2619		//  ROM( cbm610 )
2620		//-------------------------------------------------
2621
2622		#define rom_cbm610  rom_b128
2623
2624
2625		//-------------------------------------------------
2626		//  ROM( cbm620 )
2627		//-------------------------------------------------
2628
2629		#define rom_cbm620  rom_b256
2630
2631
2632		//-------------------------------------------------
2633	2569	//  ROM( cbm620_hu )
2634	2570	//-------------------------------------------------
2635	2571
r20768	r20769
2673	2609	ROM_LOAD( "906114-05.u75", 0x00, 0xf5, CRC(ff6ba6b6) SHA1(45808c570eb2eda7091c51591b3dbd2db1ac646a) )
2674	2610	ROM_END
2675	2611
	2612	#define rom_cbm710  rom_b128hp
2676	2613
	2614
2677	2615	//-------------------------------------------------
2678	2616	//  ROM( b256hp )
2679	2617	//-------------------------------------------------
r20768	r20769
2697	2635	ROM_LOAD( "906114-05.u75", 0x00, 0xf5, CRC(ff6ba6b6) SHA1(45808c570eb2eda7091c51591b3dbd2db1ac646a) )
2698	2636	ROM_END
2699	2637
	2638	#define rom_cbm720  rom_b256hp
2700	2639
	2640
2701	2641	//-------------------------------------------------
2702	2642	//  ROM( bx256hp )
2703	2643	//-------------------------------------------------
r20768	r20769
2724	2664	ROM_LOAD( "906114-05.u75", 0x00, 0xf5, CRC(ff6ba6b6) SHA1(45808c570eb2eda7091c51591b3dbd2db1ac646a) )
2725	2665	ROM_END
2726	2666
2727
2728		//-------------------------------------------------
2729		//  ROM( cbm710 )
2730		//-------------------------------------------------
2731
2732		#define rom_cbm710  rom_b128hp
2733
2734
2735		//-------------------------------------------------
2736		//  ROM( cbm720 )
2737		//-------------------------------------------------
2738
2739		#define rom_cbm720  rom_b256hp
2740
2741
2742		//-------------------------------------------------
2743		//  ROM( cbm730 )
2744		//-------------------------------------------------
2745
2746	2667	#define rom_cbm730  rom_bx256hp
2747	2668
2748	2669

trunk/src/mess/drivers/vic10.c

r20768	r20769
555	555	m_cassette->motor_w(BIT(data, 5));
556	556	}
557	557
558		//-------------------------------------------------
559		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
560		//-------------------------------------------------
561	558
562		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
563		{
564		DEVCB_DEVICE_LINE_MEMBER(MOS6526_TAG, mos6526_device, flag_w)
565		};
566
567
568	559	//-------------------------------------------------
569	560	//  C64_EXPANSION_INTERFACE( expansion_intf )
570	561	//-------------------------------------------------
r20768	r20769
652	643	MCFG_SOUND_ADD(MOS6581_TAG, SID6581, VIC6566_CLOCK)
653	644	MCFG_SOUND_CONFIG(sid_intf)
654	645	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
655		MCFG_SOUND_ADD("dac", DAC, 0)
656		MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
657	646
658	647	// devices
659	648	MCFG_MOS6526_ADD(MOS6526_TAG, VIC6566_CLOCK, 60, cia_intf)
660		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, NULL, NULL)
	649	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
661	650	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
	651	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(MOS6566_TAG, mos6566_device, lp_w))
662	652	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
663	653	MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, VIC6566_CLOCK, expansion_intf, vic10_expansion_cards, NULL, NULL)
664	654

trunk/src/mess/drivers/vic20.c

r20768	r20769
702	702
703	703
704	704	//-------------------------------------------------
705		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
706		//-------------------------------------------------
707
708		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
709		{
710		DEVCB_DEVICE_LINE_MEMBER(M6522_1_TAG, via6522_device, write_ca1),
711		};
712
713
714		//-------------------------------------------------
715	705	//  CBM_IEC_INTERFACE( cbm_iec_intf )
716	706	//-------------------------------------------------
717	707
r20768	r20769
822	812	// devices
823	813	MCFG_VIA6522_ADD(M6522_0_TAG, 0, via0_intf)
824	814	MCFG_VIA6522_ADD(M6522_1_TAG, 0, via1_intf)
825		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c1530", NULL)
	815	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", NULL, DEVWRITELINE(M6522_1_TAG, via6522_device, write_ca1))
826	816	MCFG_CBM_IEC_ADD(cbm_iec_intf, "c1541")
827		MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL)
828	817	MCFG_VIC20_USER_PORT_ADD(VIC20_USER_PORT_TAG, user_intf, vic20_user_port_cards, NULL, NULL)
829	818	MCFG_QUICKLOAD_ADD("quickload", cbm_vc20, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
830	819
r20768	r20769
853	842	MCFG_SPEAKER_STANDARD_MONO("mono")
854	843	MCFG_MOS6560_ADD(M6560_TAG, SCREEN_TAG, MOS6560_CLOCK, vic_intf, vic_videoram_map, vic_colorram_map)
855	844	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
856		MCFG_SOUND_ADD("dac", DAC, 0)
857		MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
858	845
859	846	// devices
860	847	MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6560_CLOCK, expansion_intf, vic20_expansion_cards, NULL, NULL)
	848	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL)
	849	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(M6560_TAG, mos6560_device, lp_w))
861	850
862	851	// software lists
863	852	MCFG_SOFTWARE_LIST_FILTER("cart_list", "NTSC")
r20768	r20769
880	869	MCFG_SPEAKER_STANDARD_MONO("mono")
881	870	MCFG_MOS6561_ADD(M6560_TAG, SCREEN_TAG, MOS6561_CLOCK, vic_intf, vic_videoram_map, vic_colorram_map)
882	871	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
883		MCFG_SOUND_ADD("dac", DAC, 0)
884		MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
885	872
886	873	// devices
887	874	MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6561_CLOCK, expansion_intf, vic20_expansion_cards, NULL, NULL)
	875	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy", NULL)
	876	MCFG_VCS_CONTROL_PORT_TRIGGER_HANDLER(DEVWRITELINE(M6561_TAG, mos6561_device, lp_w))
888	877
889	878	// software lists
890	879	MCFG_SOFTWARE_LIST_FILTER("cart_list", "PAL")

trunk/src/mess/drivers/plus4.c

r20768	r20769
503	503	return data;
504	504	}
505	505
506		READ8_MEMBER( plus4_state::c16_cpu_r )
	506	READ8_MEMBER( c16_state::cpu_r )
507	507	{
508	508	/*
509	509
r20768	r20769
650	650
651	651
652	652	//-------------------------------------------------
653		//  MOS6529_INTERFACE( spi_user_intf )
654		//-------------------------------------------------
655
656		static MOS6529_INTERFACE( spi_user_intf )
657		{
658		DEVCB_DEVICE_MEMBER(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_r),
659		DEVCB_DEVICE_MEMBER(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_w)
660		};
661
662
663		//-------------------------------------------------
664	653	//  MOS6529_INTERFACE( spi_kb_intf )
665	654	//-------------------------------------------------
666	655
667		READ8_MEMBER( plus4_state::spi_kb_r )
668		{
669		return 0xff;
670		}
671
672	656	WRITE8_MEMBER( plus4_state::spi_kb_w )
673	657	{
674	658	m_kb = data;
675	659	}
676	660
677		static MOS6529_INTERFACE( spi_kb_intf )
678		{
679		DEVCB_DRIVER_MEMBER(plus4_state, spi_kb_r),
680		DEVCB_DRIVER_MEMBER(plus4_state, spi_kb_w)
681		};
682	661
683
684	662	//-------------------------------------------------
685		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
	663	//  MOS6551_INTERFACE( acia_intf )
686	664	//-------------------------------------------------
687	665
688		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
	666	WRITE_LINE_MEMBER( plus4_state::acia_irq_w )
689	667	{
690		DEVCB_NULL
691		};
	668	m_acia_irq = state;
692	669
	670	check_interrupts();
	671	}
693	672
	673
694	674	//-------------------------------------------------
695	675	//  CBM_IEC_INTERFACE( iec_intf )
696	676	//-------------------------------------------------
r20768	r20769
821	801	MCFG_M7501_PORT_PULLS(0x00, 0xc0)
822	802	MCFG_CPU_VBLANK_INT_DRIVER(SCREEN_TAG, plus4_state, c16_frame_interrupt)
823	803	MCFG_CPU_PERIODIC_INT_DRIVER(plus4_state, c16_raster_interrupt, TED7360_HRETRACERATE)
824		MCFG_QUANTUM_TIME(attotime::from_hz(60))
	804	MCFG_QUANTUM_PERFECT_CPU(MOS7501_TAG)
825	805
826	806	// video and sound hardware
827	807	MCFG_SPEAKER_STANDARD_MONO("mono")
r20768	r20769
830	810
831	811	// devices
832	812	MCFG_PLS100_ADD(PLA_TAG)
833		MCFG_ACIA6551_ADD(MOS6551_TAG)
834		MCFG_MOS6529_ADD(MOS6529_USER_TAG, spi_user_intf)
835		MCFG_MOS6529_ADD(MOS6529_KB_TAG, spi_kb_intf)
836		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, plus4_datassette_devices, "c1531", NULL)
	813	MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_1_8432MHz, DEVWRITELINE(DEVICE_SELF, plus4_state, acia_irq_w))
	814	MCFG_MOS6529_ADD(MOS6529_USER_TAG, DEVREAD8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_r), DEVWRITE8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_w))
	815	MCFG_MOS6529_ADD(MOS6529_KB_TAG, CONSTANT(0xff), DEVWRITE8(DEVICE_SELF, plus4_state, spi_kb_w))
	816	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NULL, NULL)
837	817	MCFG_CBM_IEC_ADD(iec_intf, NULL)
838	818	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
839	819	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
r20768	r20769
867	847	MCFG_M7501_PORT_PULLS(0x00, 0xc0)
868	848	MCFG_CPU_VBLANK_INT_DRIVER(SCREEN_TAG, plus4_state, c16_frame_interrupt)
869	849	MCFG_CPU_PERIODIC_INT_DRIVER(plus4_state, c16_raster_interrupt, TED7360_HRETRACERATE)
870		MCFG_QUANTUM_TIME(attotime::from_hz(60))
	850	MCFG_QUANTUM_PERFECT_CPU(MOS7501_TAG)
871	851
872	852	// video and sound hardware
873	853	MCFG_SPEAKER_STANDARD_MONO("mono")
r20768	r20769
876	856
877	857	// devices
878	858	MCFG_PLS100_ADD(PLA_TAG)
879		MCFG_ACIA6551_ADD(MOS6551_TAG)
880		MCFG_MOS6529_ADD(MOS6529_USER_TAG, spi_user_intf)
881		MCFG_MOS6529_ADD(MOS6529_KB_TAG, spi_kb_intf)
882		MCFG_QUICKLOAD_ADD("quickload", cbm_c16, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
883		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, plus4_datassette_devices, "c1531", NULL)
	859	MCFG_MOS6551_ADD(MOS6551_TAG, XTAL_1_8432MHz, DEVWRITELINE(DEVICE_SELF, plus4_state, acia_irq_w))
	860	MCFG_MOS6529_ADD(MOS6529_USER_TAG, DEVREAD8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_r), DEVWRITE8(PLUS4_USER_PORT_TAG, plus4_user_port_device, p_w))
	861	MCFG_MOS6529_ADD(MOS6529_KB_TAG, CONSTANT(0xff), DEVWRITE8(DEVICE_SELF, plus4_state, spi_kb_w))
	862	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NULL, NULL)
884	863	MCFG_CBM_IEC_ADD(iec_intf, NULL)
885	864	MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL)
886	865	MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy", NULL)
887	866	MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL_17_73447MHz/20, expansion_intf, plus4_expansion_cards, "c1551", NULL)
888	867	MCFG_PLUS4_USER_PORT_ADD(PLUS4_USER_PORT_TAG, plus4_user_port_cards, NULL, NULL)
	868	MCFG_QUICKLOAD_ADD("quickload", cbm_c16, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
889	869
890	870	// internal ram
891	871	MCFG_RAM_ADD(RAM_TAG)
r20768	r20769
905	885	//  MACHINE_CONFIG( c16n )
906	886	//-------------------------------------------------
907	887
908		static MACHINE_CONFIG_DERIVED( c16n, ntsc )
	888	static MACHINE_CONFIG_DERIVED_CLASS( c16n, ntsc, c16_state )
909	889	MCFG_CPU_MODIFY(MOS7501_TAG)
910		MCFG_M7501_PORT_CALLBACKS(READ8(plus4_state, c16_cpu_r), WRITE8(plus4_state, cpu_w))
	890	MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w))
911	891	MCFG_M7501_PORT_PULLS(0x00, 0xc0)
912	892
913	893	MCFG_DEVICE_REMOVE(MOS6551_TAG)
r20768	r20769
927	907	//  MACHINE_CONFIG( c16p )
928	908	//-------------------------------------------------
929	909
930		static MACHINE_CONFIG_DERIVED( c16p, pal )
	910	static MACHINE_CONFIG_DERIVED_CLASS( c16p, pal, c16_state )
931	911	MCFG_CPU_MODIFY(MOS7501_TAG)
932		MCFG_M7501_PORT_CALLBACKS(READ8(plus4_state, c16_cpu_r), WRITE8(plus4_state, cpu_w))
	912	MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w))
933	913	MCFG_M7501_PORT_PULLS(0x00, 0xc0)
934	914
935	915	MCFG_DEVICE_REMOVE(MOS6551_TAG)

trunk/src/mess/drivers/pet2001.c

r20768	r20769
881	881
882	882
883	883	//-------------------------------------------------
884		//  PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
885		//-------------------------------------------------
886
887		static PET_DATASSETTE_PORT_INTERFACE( datassette_intf )
888		{
889		DEVCB_DEVICE_LINE_MEMBER(M6520_1_TAG, pia6821_device, ca1_w)
890		};
891
892
893		//-------------------------------------------------
894		//  PET_DATASSETTE_PORT_INTERFACE( datassette2_intf )
895		//-------------------------------------------------
896
897		static PET_DATASSETTE_PORT_INTERFACE( datassette2_intf )
898		{
899		DEVCB_DEVICE_LINE_MEMBER(M6522_TAG, via6522_device, write_cb1)
900		};
901
902
903		//-------------------------------------------------
904		//  PET_EXPANSION_INTERFACE( exp_intf )
905		//-------------------------------------------------
906
907		static PET_EXPANSION_INTERFACE( exp_intf )
908		{
909		DEVCB_DRIVER_MEMBER(pet_state, read),
910		DEVCB_DRIVER_MEMBER(pet_state, write)
911		};
912
913
914		//-------------------------------------------------
915	884	//  PET_USER_PORT_INTERFACE( user_intf )
916	885	//-------------------------------------------------
917	886
r20768	r20769
1202	1171	MCFG_PIA6821_ADD(M6520_1_TAG, pia1_intf)
1203	1172	MCFG_PIA6821_ADD(M6520_2_TAG, pia2_intf)
1204	1173	MCFG_CBM_IEEE488_ADD(ieee488_intf, "c4040")
1205		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c2n", NULL)
1206		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, datassette2_intf, cbm_datassette_devices, NULL, NULL)
1207		MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_8MHz/8, exp_intf, pet_expansion_cards, NULL, NULL)
	1174	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", NULL, DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
	1175	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
	1176	MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_8MHz/8, pet_expansion_cards, NULL, NULL)
	1177	MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
1208	1178	MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, user_intf, pet_user_port_cards, NULL, NULL)
1209	1179	MCFG_QUICKLOAD_ADD("quickload", cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
1210	1180
r20768	r20769
1478	1448	MCFG_PIA6821_ADD(M6520_1_TAG, pia1_intf)
1479	1449	MCFG_PIA6821_ADD(M6520_2_TAG, pia2_intf)
1480	1450	MCFG_CBM_IEEE488_ADD(ieee488_intf, "c8050")
1481		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, datassette_intf, cbm_datassette_devices, "c2n", NULL)
1482		MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, datassette2_intf, cbm_datassette_devices, NULL, NULL)
1483		MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, exp_intf, pet_expansion_cards, NULL, NULL)
	1451	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", NULL, DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
	1452	MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, NULL, NULL, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
	1453	MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, NULL, NULL)
	1454	MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
1484	1455	MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, user_intf, pet_user_port_cards, NULL, NULL)
1485	1456	MCFG_QUICKLOAD_ADD("quickload", cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
1486	1457
r20768	r20769
1505	1476
1506	1477	static MACHINE_CONFIG_DERIVED_CLASS( superpet, pet8032, superpet_state )
1507	1478	MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
1508		MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, exp_intf, pet_expansion_cards, "superpet", NULL)
	1479	MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet", NULL)
	1480	MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
1509	1481
1510	1482	MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop")
1511	1483	MACHINE_CONFIG_END

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team