MAME SVN History

199869 Revisions

r18809 Friday 2nd November, 2012 at 14:26:57 UTC by Robbbert
Williams Pinball : WIP

[src/mame/drivers]

s3.c s4.c s6.c s6a.c s7.c s8.c s9.c

trunk/src/mame/drivers/s4.c
r18808	r18809
39	39	m_maincpu(*this, "maincpu"),
40	40	m_audiocpu(*this, "audiocpu"),
41	41	m_dac(*this, "dac"),
42		m_pia0(*this, "pia0"),
43		m_pia1(*this, "pia1"),
44		m_pia2(*this, "pia2"),
45		m_pia3(*this, "pia3"),
46		m_pia4(*this, "pia4")
	42	m_pia22(*this, "pia22"),
	43	m_pia24(*this, "pia24"),
	44	m_pia28(*this, "pia28"),
	45	m_pia30(*this, "pia30"),
	46	m_pias(*this, "pias")
47	47	{ }
48	48
49	49	DECLARE_READ8_MEMBER(dac_r);
r18808	r18809
57	57	DECLARE_READ8_MEMBER(dips_r);
58	58	DECLARE_READ8_MEMBER(switch_r);
59	59	DECLARE_WRITE8_MEMBER(switch_w);
60		DECLARE_READ_LINE_MEMBER(pia2_ca1_r);
61		DECLARE_READ_LINE_MEMBER(pia2_cb1_r);
62		DECLARE_READ_LINE_MEMBER(pia4_cb1_r);
63		DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w) { }; //ST5
64		DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w) { }; //ST-solenoids enable
65		DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w) { }; //ST2
66		DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w) { }; //ST1
67		DECLARE_WRITE_LINE_MEMBER(pia2_ca2_w) { }; //diag leds enable
68		DECLARE_WRITE_LINE_MEMBER(pia2_cb2_w) { }; //ST6
69		DECLARE_WRITE_LINE_MEMBER(pia3_ca2_w) { }; //ST4
70		DECLARE_WRITE_LINE_MEMBER(pia3_cb2_w) { }; //ST3
	60	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
	61	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
	62	DECLARE_READ_LINE_MEMBER(pias_cb1_r);
	63	DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
	64	DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
	65	DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
	66	DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; //ST1
	67	DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; //diag leds enable
	68	DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; //ST6
	69	DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
	70	DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
71	71	TIMER_DEVICE_CALLBACK_MEMBER(irq);
72	72	DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
73	73	DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
r18808	r18809
79	79	required_device<cpu_device> m_maincpu;
80	80	optional_device<cpu_device> m_audiocpu;
81	81	optional_device<dac_device> m_dac;
82		required_device<pia6821_device> m_pia0;
83		required_device<pia6821_device> m_pia1;
84		required_device<pia6821_device> m_pia2;
85		required_device<pia6821_device> m_pia3;
86		optional_device<pia6821_device> m_pia4;
	82	required_device<pia6821_device> m_pia22;
	83	required_device<pia6821_device> m_pia24;
	84	required_device<pia6821_device> m_pia28;
	85	required_device<pia6821_device> m_pia30;
	86	optional_device<pia6821_device> m_pias;
87	87	private:
88	88	UINT8 m_t_c;
89	89	UINT8 m_sound_data;
r18808	r18809
98	98	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
99	99	AM_RANGE(0x0000, 0x00ff) AM_RAM
100	100	AM_RANGE(0x0100, 0x01ff) AM_RAM AM_SHARE("nvram")
101		AM_RANGE(0x2200, 0x2203) AM_DEVREADWRITE("pia0", pia6821_device, read, write) // solenoids
102		AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia1", pia6821_device, read, write) // lamps
103		AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia2", pia6821_device, read, write) // display
104		AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia3", pia6821_device, read, write) // inputs
	101	AM_RANGE(0x2200, 0x2203) AM_DEVREADWRITE("pia22", pia6821_device, read, write) // solenoids
	102	AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps
	103	AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display
	104	AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs
105	105	AM_RANGE(0x6000, 0x7fff) AM_ROM
106	106	ADDRESS_MAP_END
107	107
108	108	static ADDRESS_MAP_START( s4_audio_map, AS_PROGRAM, 8, s4_state )
	109	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
109	110	AM_RANGE(0x0000, 0x00ff) AM_RAM
110		AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia4", pia6821_device, read, write) // sounds
111		AM_RANGE(0x3000, 0x7fff) AM_MIRROR(0x8000) AM_ROM
	111	AM_RANGE(0x0400, 0x0403) AM_DEVREADWRITE("pias", pia6821_device, read, write) // sounds
	112	AM_RANGE(0x7800, 0x7fff) AM_ROM
112	113	ADDRESS_MAP_END
113	114
114	115	static INPUT_PORTS_START( s4 )
r18808	r18809
296	297	//m_samples->start(1, x); // 10k chime
297	298	}
298	299	else
299		{~~printf("%X ",data);~~
	300	{
300	301	m_sound_data = ioport("SND")->read();
301	302	if (BIT(data, 0))
302	303	m_sound_data &= 0xfe;
r18808	r18809
313	314	if (BIT(data, 4))
314	315	m_sound_data &= 0x7f;
315	316
316		m_cb1 = ((m_sound_data & 0x7f) != 0x7f);
	317	m_cb1 = ((m_sound_data & 0x9f) != 0x9f);
317	318
318		m_pia4->cb1_w(m_cb1);
	319	m_pias->cb1_w(m_cb1);
319	320	}
320	321
321	322	if (BIT(data, 5))
322	323	m_samples->start(0, 6); // knocker
323	324	}
324	325
325		static const pia6821_interface pia0_intf =
	326	static const pia6821_interface pia22_intf =
326	327	{
327	328	DEVCB_NULL, /* port A in */
328	329	DEVCB_NULL, /* port B in */
r18808	r18809
332	333	DEVCB_NULL, /* line CB2 in */
333	334	DEVCB_DRIVER_MEMBER(s4_state, sol0_w), /* port A out */
334	335	DEVCB_DRIVER_MEMBER(s4_state, sol1_w), /* port B out */
335		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia0_ca2_w), /* line CA2 out */
336		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia0_cb2_w), /* line CB2 out */
	336	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia22_ca2_w), /* line CA2 out */
	337	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia22_cb2_w), /* line CB2 out */
337	338	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
338	339	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
339	340	};
r18808	r18809
347	348	{
348	349	}
349	350
350		static const pia6821_interface pia1_intf =
	351	static const pia6821_interface pia24_intf =
351	352	{
352	353	DEVCB_NULL, /* port A in */
353	354	DEVCB_NULL, /* port B in */
r18808	r18809
357	358	DEVCB_NULL, /* line CB2 in */
358	359	DEVCB_DRIVER_MEMBER(s4_state, lamp0_w), /* port A out */
359	360	DEVCB_DRIVER_MEMBER(s4_state, lamp1_w), /* port B out */
360		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia1_ca2_w), /* line CA2 out */
361		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia1_cb2_w), /* line CB2 out */
	361	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia24_ca2_w), /* line CA2 out */
	362	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia24_cb2_w), /* line CB2 out */
362	363	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
363	364	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
364	365	};
365	366
366		READ_LINE_MEMBER( s4_state::pia2_ca1_r )
	367	READ_LINE_MEMBER( s4_state::pia28_ca1_r )
367	368	{
368	369	return BIT(ioport("DIAGS")->read(), 2); // advance button
369	370	}
370	371
371		READ_LINE_MEMBER( s4_state::pia2_cb1_r )
	372	READ_LINE_MEMBER( s4_state::pia28_cb1_r )
372	373	{
373	374	return BIT(ioport("DIAGS")->read(), 3); // auto/manual switch
374	375	}
r18808	r18809
415	416	m_data_ok = false;
416	417	}
417	418
418		static const pia6821_interface pia2_intf =
	419	static const pia6821_interface pia28_intf =
419	420	{
420	421	DEVCB_DRIVER_MEMBER(s4_state, dips_r), /* port A in */
421	422	DEVCB_NULL, /* port B in */
422		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia2_ca1_r), /* line CA1 in */
423		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia2_cb1_r), /* line CB1 in */
	423	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia28_ca1_r), /* line CA1 in */
	424	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia28_cb1_r), /* line CB1 in */
424	425	DEVCB_NULL, /* line CA2 in */
425	426	DEVCB_NULL, /* line CB2 in */
426	427	DEVCB_DRIVER_MEMBER(s4_state, dig0_w), /* port A out */
427	428	DEVCB_DRIVER_MEMBER(s4_state, dig1_w), /* port B out */
428		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia2_ca2_w), /* line CA2 out */
429		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia2_cb2_w), /* line CB2 out */
	429	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia28_ca2_w), /* line CA2 out */
	430	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia28_cb2_w), /* line CB2 out */
430	431	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
431	432	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
432	433	};
r18808	r18809
435	436	{
436	437	char kbdrow[8];
437	438	sprintf(kbdrow,"X%X",m_kbdrow);
438		return ioport(kbdrow)->read();
	439	return ~ioport(kbdrow)->read();
439	440	}
440	441
441	442	WRITE8_MEMBER( s4_state::switch_w )
r18808	r18809
443	444	m_kbdrow = data;
444	445	}
445	446
446		static const pia6821_interface pia3_intf =
	447	static const pia6821_interface pia30_intf =
447	448	{
448	449	DEVCB_DRIVER_MEMBER(s4_state, switch_r), /* port A in */
449	450	DEVCB_NULL, /* port B in */
r18808	r18809
453	454	DEVCB_NULL, /* line CB2 in */
454	455	DEVCB_NULL, /* port A out */
455	456	DEVCB_DRIVER_MEMBER(s4_state, switch_w), /* port B out */
456		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia3_ca2_w), /* line CA2 out */
457		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia3_cb2_w), /* line CB2 out */
	457	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia30_ca2_w), /* line CA2 out */
	458	DEVCB_DRIVER_LINE_MEMBER(s4_state, pia30_cb2_w), /* line CB2 out */
458	459	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
459	460	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
460	461	};
461	462
462		READ_LINE_MEMBER( s4_state::pia4_cb1_r )
	463	READ_LINE_MEMBER( s4_state::pias_cb1_r )
463	464	{
464	465	return m_cb1;
465	466	}
466	467
467	468	READ8_MEMBER( s4_state::dac_r )
468		{~~printf("%X ",m_sound_data);~~
	469	{
469	470	return m_sound_data;
470	471	}
471	472
r18808	r18809
474	475	m_dac->write_unsigned8(data);
475	476	}
476	477
477		static const pia6821_interface pia4_intf =
	478	static const pia6821_interface pias_intf =
478	479	{
479	480	DEVCB_NULL, /* port A in */
480	481	DEVCB_DRIVER_MEMBER(s4_state, dac_r), /* port B in */
481	482	DEVCB_NULL, /* line CA1 in */
482		DEVCB_DRIVER_LINE_MEMBER(s4_state, pia4_cb1_r), /* line CB1 in */
	483	DEVCB_DRIVER_LINE_MEMBER(s4_state, pias_cb1_r), /* line CB1 in */
483	484	DEVCB_NULL, /* line CA2 in */
484	485	DEVCB_NULL, /* line CB2 in */
485	486	DEVCB_DRIVER_MEMBER(s4_state, dac_w), /* port A out */
r18808	r18809
502	503	/* basic machine hardware */
503	504	MCFG_CPU_ADD("maincpu", M6802, 3580000)
504	505	MCFG_CPU_PROGRAM_MAP(s4_main_map)
505		MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s4_state, irq, attotime::from_hz(~~100~~0))
	506	MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s4_state, irq, attotime::from_hz(250))
506	507	MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4)
507	508
508	509	/* Video */
r18808	r18809
512	513	MCFG_FRAGMENT_ADD( genpin_audio )
513	514
514	515	/* Devices */
515		MCFG_PIA6821_ADD("pia0", pia0_intf)
516		MCFG_PIA6821_ADD("pia1", pia1_intf)
517		MCFG_PIA6821_ADD("pia2", pia2_intf)
518		MCFG_PIA6821_ADD("pia3", pia3_intf)
	516	MCFG_PIA6821_ADD("pia22", pia22_intf)
	517	MCFG_PIA6821_ADD("pia24", pia24_intf)
	518	MCFG_PIA6821_ADD("pia28", pia28_intf)
	519	MCFG_PIA6821_ADD("pia30", pia30_intf)
519	520	MCFG_NVRAM_ADD_1FILL("nvram")
520	521	MACHINE_CONFIG_END
521	522
r18808	r18809
527	528	MCFG_SPEAKER_STANDARD_MONO("mono")
528	529	MCFG_SOUND_ADD("dac", DAC, 0)
529	530	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
530		MCFG_PIA6821_ADD("pia4", pia4_intf)
	531	MCFG_PIA6821_ADD("pias", pias_intf)
531	532	MACHINE_CONFIG_END
532	533
533	534
r18808	r18809
555	556	ROM_END
556	557
557	558	/*--------------------------------
	559	/ Tri Zone - Sys.4 (Game #487)
	560	/-------------------------------*/
	561	ROM_START(trizn_l1)
	562	ROM_REGION(0x10000, "maincpu", 0)
	563	ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(757091c5) SHA1(00dac6c19b08d2528ea293619c4a39499a1a02c2))
	564	ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
	565	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
	566
	567	ROM_REGION(0x10000, "audiocpu", 0)
	568	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
	569	ROM_END
	570
	571	ROM_START(trizn_t1)
	572	ROM_REGION(0x10000, "maincpu", 0)
	573	ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(757091c5) SHA1(00dac6c19b08d2528ea293619c4a39499a1a02c2))
	574	ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
	575	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
	576
	577	ROM_REGION(0x10000, "audiocpu", 0)
	578	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
	579	ROM_END
	580
	581	/*--------------------------------
	582	/ Time Warp - Sys.4 (Game #489)
	583	/-------------------------------*/
	584	ROM_START(tmwrp_l2)
	585	ROM_REGION(0x10000, "maincpu", 0)
	586	ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(b168df09) SHA1(d4c97714636ce51be2e5f8cc5af89e10a2f82ac7))
	587	ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
	588	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
	589
	590	ROM_REGION(0x10000, "audiocpu", 0)
	591	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
	592	ROM_END
	593
	594	ROM_START(tmwrp_t2)
	595	ROM_REGION(0x10000, "maincpu", 0)
	596	ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(b168df09) SHA1(d4c97714636ce51be2e5f8cc5af89e10a2f82ac7))
	597	ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
	598	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
	599
	600	ROM_REGION(0x10000, "audiocpu", 0)
	601	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
	602	ROM_END
	603
	604	/*--------------------------------
558	605	/ Stellar Wars - Sys.4 (Game #490)
559	606	/-------------------------------*/
560	607	ROM_START(stlwr_l2)
r18808	r18809
567	614	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
568	615	ROM_END
569	616
	617	/*-----------------------------
	618	/ Scorpion - Sys.6 (Game #494)
	619	/----------------------------*/
	620	ROM_START(scrpn_l1)
	621	ROM_REGION(0x10000, "maincpu", 0)
	622	ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(881109a9) SHA1(53d4275c76b47b68a74209fe660d943a51e90eca))
	623	ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
	624	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
	625
	626	ROM_REGION(0x10000, "audiocpu", 0)
	627	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
	628	ROM_END
	629
	630	ROM_START(scrpn_t1)
	631	ROM_REGION(0x10000, "maincpu", 0)
	632	ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(881109a9) SHA1(53d4275c76b47b68a74209fe660d943a51e90eca))
	633	ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
	634	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
	635
	636	ROM_REGION(0x10000, "audiocpu", 0)
	637	ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
	638	ROM_END
	639
570	640	/* From here, are NOT pinball machines */
571	641
572	642	/*----------------------------
r18808	r18809
668	738	ROM_END
669	739
670	740
671		GAME(1979,flash_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (L-1)", GAME_IS_SKELETON_MECHANICAL)
672		GAME(1979,flash_t1, flash_l1, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (T-1) Ted Estes", GAME_IS_SKELETON_MECHANICAL)
673		GAME(1979,stlwr_l2, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Stellar Wars (L-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
674		GAME(1978,pomp_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Pompeii (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
675		GAME(1978,arist_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Aristocrat (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
676		GAME(1978,topaz_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Topaz (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
677		GAME(1979,taurs_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Taurus (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
678		GAME(1979,kingt_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "King Tut (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
679		GAME(1980,omni_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Omni (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
680		GAME(1983,bstrk_l1, 0, s4, s4, driver_device, 0, ROT0, "Williams", "Big Strike (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
681		GAME(1983,tstrk_l1, 0, s4, s4, driver_device, 0, ROT0, "Williams", "Triple Strike (Shuffle) (L-1)", GAME_IS_SKELETON_MECHANICAL)
	741	GAME( 1979, flash_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	742	GAME( 1979, flash_t1, flash_l1, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (T-1) Ted Estes", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	743	GAME( 1978, trizn_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Tri Zone (L-1)", GAME_MECHANICAL \| GAME_NO_SOUND)
	744	GAME( 1978, trizn_t1, trizn_l1, s4a, s4, driver_device, 0, ROT0, "Williams", "Tri Zone (T-1)", GAME_MECHANICAL \| GAME_NO_SOUND)
	745	GAME( 1979, tmwrp_l2, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Time Warp (L-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
	746	GAME( 1979, tmwrp_t2, tmwrp_l2, s4a, s4, driver_device, 0, ROT0, "Williams", "Time Warp (T-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
	747	GAME( 1979, stlwr_l2, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Stellar Wars (L-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
	748	GAME( 1980, scrpn_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Scorpion (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	749	GAME( 1980, scrpn_t1, scrpn_l1, s4a, s4, driver_device, 0, ROT0, "Williams", "Scorpion (T-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	750	GAME( 1978, pomp_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Pompeii (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	751	GAME( 1978, arist_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Aristocrat (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	752	GAME( 1978, topaz_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Topaz (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	753	GAME( 1979, taurs_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Taurus (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	754	GAME( 1979, kingt_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "King Tut (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	755	GAME( 1980, omni_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Omni (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	756	GAME( 1983, bstrk_l1, 0, s4, s4, driver_device, 0, ROT0, "Williams", "Big Strike (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	757	GAME( 1983, tstrk_l1, 0, s4, s4, driver_device, 0, ROT0, "Williams", "Triple Strike (Shuffle) (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)

trunk/src/mame/drivers/s6.c
r18808	r18809
16	16	#include "machine/genpin.h"
17	17	#include "cpu/m6800/m6800.h"
18	18	#include "machine/6821pia.h"
	19	#include "sound/hc55516.h"
19	20	#include "sound/dac.h"
20	21	#include "s6.lh"
21	22
r18808	r18809
26	27	s6_state(const machine_config &mconfig, device_type type, const char *tag)
27	28	: genpin_class(mconfig, type, tag),
28	29	m_maincpu(*this, "maincpu"),
	30	m_audiocpu(*this, "audiocpu"),
29	31	m_dac(*this, "dac"),
30		m_pia0(*this, "pia0"),
31		m_pia1(*this, "pia1"),
32		m_pia2(*this, "pia2"),
33		m_pia3(*this, "pia3"),
34		m_pia4(*this, "pia4")
	32	m_hc55516(*this, "hc55516"),
	33	m_pias(*this, "pias"),
	34	m_pia22(*this, "pia22"),
	35	m_pia24(*this, "pia24"),
	36	m_pia28(*this, "pia28"),
	37	m_pia30(*this, "pia30")
35	38	{ }
36	39
37	40	DECLARE_READ8_MEMBER(dac_r);
r18808	r18809
40	43	DECLARE_WRITE8_MEMBER(dig1_w);
41	44	DECLARE_WRITE8_MEMBER(lamp0_w);
42	45	DECLARE_WRITE8_MEMBER(lamp1_w);
	46	DECLARE_READ8_MEMBER(dips_r);
43	47	DECLARE_WRITE8_MEMBER(sol0_w);
44	48	DECLARE_WRITE8_MEMBER(sol1_w);
45	49	DECLARE_READ8_MEMBER(switch_r);
46	50	DECLARE_WRITE8_MEMBER(switch_w);
47		DECLARE_READ_LINE_MEMBER(cb1_r);
	51	DECLARE_WRITE8_MEMBER(pias_pb_w) { }; // dummy to stop log filling up
	52	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
	53	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
	54	DECLARE_READ_LINE_MEMBER(pias_cb1_r);
	55	DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
	56	DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
	57	DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
	58	DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
	59	DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
	60	DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; //ST1
	61	DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; //diag leds enable
	62	DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; //ST6
	63	DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
	64	DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
48	65	TIMER_DEVICE_CALLBACK_MEMBER(irq);
49		DECLARE_INPUT_CHANGED_MEMBER(nmi);
	66	DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
	67	DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
50	68	DECLARE_MACHINE_RESET(s6);
51	69	protected:
52	70
53	71	// devices
54	72	required_device<cpu_device> m_maincpu;
55		optional_device<dac_device> m_dac;
56		required_device<pia6821_device> m_pia0;
57		required_device<pia6821_device> m_pia1;
58		required_device<pia6821_device> m_pia2;
59		required_device<pia6821_device> m_pia3;
60		optional_device<pia6821_device> m_pia4;
	73	required_device<cpu_device> m_audiocpu;
	74	required_device<dac_device> m_dac;
	75	required_device<hc55516_device> m_hc55516;
	76	required_device<pia6821_device> m_pias;
	77	required_device<pia6821_device> m_pia22;
	78	required_device<pia6821_device> m_pia24;
	79	required_device<pia6821_device> m_pia28;
	80	required_device<pia6821_device> m_pia30;
61	81	private:
62	82	UINT8 m_t_c;
63	83	UINT8 m_sound_data;
r18808	r18809
71	91	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
72	92	AM_RANGE(0x0000, 0x00ff) AM_RAM
73	93	AM_RANGE(0x0100, 0x01ff) AM_RAM AM_SHARE("nvram")
74		AM_RANGE(0x2200, 0x2203) AM_DEVREADWRITE("pia0", pia6821_device, read, write) // solenoids
75		AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia1", pia6821_device, read, write) // lamps
76		AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia2", pia6821_device, read, write) // display
77		AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia3", pia6821_device, read, write) // inputs
	94	AM_RANGE(0x2200, 0x2203) AM_DEVREADWRITE("pia22", pia6821_device, read, write) // solenoids
	95	AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps
	96	AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display
	97	AM_RANGE(0xb000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs
78	98	AM_RANGE(0x6000, 0x7fff) AM_ROM
79	99	ADDRESS_MAP_END
80	100
81	101	static ADDRESS_MAP_START( s6_audio_map, AS_PROGRAM, 8, s6_state )
82		ADDRESS_MAP_GLOBAL_MASK(0x7fff)
83		AM_RANGE(0x0000, 0x007f) AM_RAM
84		AM_RANGE(0x0400, 0x0403) AM_DEVREADWRITE("pia4", pia6821_device, read, write) // sounds
85		AM_RANGE(0x0800, 0x7fff) AM_ROM
	102	AM_RANGE(0x0000, 0x00ff) AM_RAM
	103	AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pias", pia6821_device, read, write)
	104	AM_RANGE(0xA000, 0xffff) AM_ROM
86	105	ADDRESS_MAP_END
87	106
88	107	static INPUT_PORTS_START( s6 )
r18808	r18809
160	179	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Music") PORT_CODE(KEYCODE_9) PORT_TOGGLE
161	180
162	181	PORT_START("DIAGS")
163		PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Diagnostic") PORT_CODE(KEYCODE_0) PORT_CHANGED_MEMBER(DEVICE_SELF, s6_state, nmi, 1)
	182	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, s6_state, audio_nmi, 1)
	183	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Main Diag") PORT_CODE(KEYCODE_F2) PORT_CHANGED_MEMBER(DEVICE_SELF, s6_state, main_nmi, 1)
	184	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Advance") PORT_CODE(KEYCODE_0)
	185	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Manual/Auto") PORT_CODE(KEYCODE_9)
	186	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter") PORT_CODE(KEYCODE_8)
	187
	188	PORT_START("DSW0")
	189	PORT_DIPNAME( 0x01, 0x01, "SW01" )
	190	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	191	PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
	192	PORT_DIPNAME( 0x02, 0x02, "SW02" )
	193	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	194	PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
	195	PORT_DIPNAME( 0x04, 0x04, "SW03" )
	196	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	197	PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
	198	PORT_DIPNAME( 0x08, 0x08, "SW04" )
	199	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	200	PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
	201	PORT_DIPNAME( 0x10, 0x10, "SW05" )
	202	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	203	PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
	204	PORT_DIPNAME( 0x20, 0x20, "SW06" )
	205	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	206	PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
	207	PORT_DIPNAME( 0x40, 0x40, "SW07" )
	208	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	209	PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
	210	PORT_DIPNAME( 0x80, 0x80, "SW08" )
	211	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	212	PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
	213
	214	PORT_START("DSW1")
	215	PORT_DIPNAME( 0x01, 0x01, "SW11" )
	216	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	217	PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
	218	PORT_DIPNAME( 0x02, 0x02, "SW12" )
	219	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	220	PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
	221	PORT_DIPNAME( 0x04, 0x04, "SW13" )
	222	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	223	PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
	224	PORT_DIPNAME( 0x08, 0x08, "SW14" )
	225	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	226	PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
	227	PORT_DIPNAME( 0x10, 0x10, "SW15" )
	228	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	229	PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
	230	PORT_DIPNAME( 0x20, 0x20, "SW16" )
	231	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	232	PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
	233	PORT_DIPNAME( 0x40, 0x40, "SW17" )
	234	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	235	PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
	236	PORT_DIPNAME( 0x80, 0x80, "SW18" )
	237	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
	238	PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
164	239	INPUT_PORTS_END
165	240
166	241	MACHINE_RESET_MEMBER( s6_state, s6 )
r18808	r18809
168	243	m_t_c = 0;
169	244	}
170	245
171		INPUT_CHANGED_MEMBER( s6_state::nmi )
	246	INPUT_CHANGED_MEMBER( s6_state::main_nmi )
172	247	{
173	248	// Diagnostic button sends a pulse to NMI pin
174	249	if (newval==CLEAR_LINE)
175	250	m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
176	251	}
177	252
	253	INPUT_CHANGED_MEMBER( s6_state::audio_nmi )
	254	{
	255	// Diagnostic button sends a pulse to NMI pin
	256	if (newval==CLEAR_LINE)
	257	m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
	258	}
	259
178	260	WRITE8_MEMBER( s6_state::sol0_w )
179	261	{
180	262	if (BIT(data, 4))
r18808	r18809
184	266	WRITE8_MEMBER( s6_state::sol1_w )
185	267	{
186	268	m_sound_data = ioport("SND")->read(); // 0xff or 0xbf
	269
187	270	if (BIT(data, 0))
188	271	m_sound_data &= 0xfe;
189		~~else~~
	272
190	273	if (BIT(data, 1))
191	274	m_sound_data &= 0xfd;
192		~~else~~
	275
193	276	if (BIT(data, 2))
194	277	m_sound_data &= 0xfb;
195		~~else~~
	278
196	279	if (BIT(data, 3))
197	280	m_sound_data &= 0xf7;
198		~~else~~
	281
199	282	if (BIT(data, 4))
200		m_sound_data &= 0x7f;
	283	m_sound_data &= 0xef;
201	284
202		if ((m_sound_data & 0xbf) == 0xbf)
203		{
204		m_cb1 = 0;
205		m_pia4->cb1_w(0);
206		}
207		else
208		{
209		m_cb1 = 1;
210		m_pia4->cb1_w(1);
211		}
	285	m_cb1 = ((m_sound_data & 0x9f) != 0x9f);
212	286
	287	m_pias->cb1_w(m_cb1);
	288
213	289	if (BIT(data, 5))
214	290	m_samples->start(0, 6); // knocker
215	291	}
216	292
217		static const pia6821_interface pia0_intf =
	293	static const pia6821_interface pia22_intf =
218	294	{
219	295	DEVCB_NULL, /* port A in */
220	296	DEVCB_NULL, /* port B in */
r18808	r18809
224	300	DEVCB_NULL, /* line CB2 in */
225	301	DEVCB_DRIVER_MEMBER(s6_state, sol0_w), /* port A out */
226	302	DEVCB_DRIVER_MEMBER(s6_state, sol1_w), /* port B out */
227		DEVCB_NULL, /* line CA2 out */
228		DEVCB_NULL, /* port CB2 out */
	303	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia22_ca2_w), /* line CA2 out */
	304	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia22_cb2_w), /* line CB2 out */
229	305	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
230	306	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
231	307	};
r18808	r18809
239	315	{
240	316	}
241	317
242		static const pia6821_interface pia1_intf =
	318	static const pia6821_interface pia24_intf =
243	319	{
244	320	DEVCB_NULL, /* port A in */
245	321	DEVCB_NULL, /* port B in */
r18808	r18809
249	325	DEVCB_NULL, /* line CB2 in */
250	326	DEVCB_DRIVER_MEMBER(s6_state, lamp0_w), /* port A out */
251	327	DEVCB_DRIVER_MEMBER(s6_state, lamp1_w), /* port B out */
252		DEVCB_NULL, /* line CA2 out */
253		DEVCB_NULL, /* port CB2 out */
	328	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia24_ca2_w), /* line CA2 out */
	329	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia24_cb2_w), /* line CB2 out */
254	330	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
255	331	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
256	332	};
257	333
	334	READ_LINE_MEMBER( s6_state::pia28_ca1_r )
	335	{
	336	return BIT(ioport("DIAGS")->read(), 2); // advance button
	337	}
	338
	339	READ_LINE_MEMBER( s6_state::pia28_cb1_r )
	340	{
	341	return BIT(ioport("DIAGS")->read(), 3); // auto/manual switch
	342	}
	343
	344	READ8_MEMBER( s6_state::dips_r )
	345	{
	346	if (BIT(ioport("DIAGS")->read(), 4) )
	347	{
	348	switch (m_strobe)
	349	{
	350	case 0:
	351	return ioport("DSW0")->read() & 15;
	352	break;
	353	case 1:
	354	return ioport("DSW0")->read() << 4;
	355	break;
	356	case 2:
	357	return ioport("DSW1")->read() & 15;
	358	break;
	359	case 3:
	360	return ioport("DSW1")->read() << 4;
	361	break;
	362	}
	363	}
	364	return 0xff;
	365	}
	366
258	367	WRITE8_MEMBER( s6_state::dig0_w )
259	368	{
260	369	m_strobe = data;
r18808	r18809
272	381	m_data_ok = false;
273	382	}
274	383
275		static const pia6821_interface pia2_intf =
	384	static const pia6821_interface pia28_intf =
276	385	{
277		DEVCB_~~NULL~~, /* port A in */
	386	DEVCB_DRIVER_MEMBER(s6_state, dips_r), /* port A in */
278	387	DEVCB_NULL, /* port B in */
279		DEVCB_NULL, /* line CA1 in */
280		DEVCB_NULL, /* line CB1 in */
	388	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia28_ca1_r), /* line CA1 in */
	389	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia28_cb1_r), /* line CB1 in */
281	390	DEVCB_NULL, /* line CA2 in */
282	391	DEVCB_NULL, /* line CB2 in */
283	392	DEVCB_DRIVER_MEMBER(s6_state, dig0_w), /* port A out */
284	393	DEVCB_DRIVER_MEMBER(s6_state, dig1_w), /* port B out */
285		DEVCB_NULL, /* line CA2 out */
286		DEVCB_NULL, /* port CB2 out */
	394	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia28_ca2_w), /* line CA2 out */
	395	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia28_cb2_w), /* line CB2 out */
287	396	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
288	397	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
289	398	};
r18808	r18809
292	401	{
293	402	char kbdrow[8];
294	403	sprintf(kbdrow,"X%X",m_kbdrow);
295		return ioport(kbdrow)->read();
	404	return ~ioport(kbdrow)->read();
296	405	}
297	406
298	407	WRITE8_MEMBER( s6_state::switch_w )
r18808	r18809
300	409	m_kbdrow = data;
301	410	}
302	411
303		static const pia6821_interface pia3_intf =
	412	static const pia6821_interface pia30_intf =
304	413	{
305	414	DEVCB_DRIVER_MEMBER(s6_state, switch_r), /* port A in */
306	415	DEVCB_NULL, /* port B in */
r18808	r18809
310	419	DEVCB_NULL, /* line CB2 in */
311	420	DEVCB_NULL, /* port A out */
312	421	DEVCB_DRIVER_MEMBER(s6_state, switch_w), /* port B out */
313		DEVCB_NULL, /* line CA2 out */
314		DEVCB_NULL, /* port CB2 out */
	422	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia30_ca2_w), /* line CA2 out */
	423	DEVCB_DRIVER_LINE_MEMBER(s6_state, pia30_cb2_w), /* line CB2 out */
315	424	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
316	425	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
317	426	};
318	427
319		READ_LINE_MEMBER( s6_state::cb1_r )
	428	READ_LINE_MEMBER( s6_state::pias_cb1_r )
320	429	{
321	430	return m_cb1;
322	431	}
323	432
	433	WRITE_LINE_MEMBER( s6_state::pias_cb2_w )
	434	{
	435	// speech clock
	436	hc55516_clock_w(m_hc55516, state);
	437	}
	438
	439	WRITE_LINE_MEMBER( s6_state::pias_ca2_w )
	440	{
	441	// speech data
	442	hc55516_digit_w(m_hc55516, state);
	443	}
	444
324	445	READ8_MEMBER( s6_state::dac_r )
325	446	{
326	447	return m_sound_data;
r18808	r18809
331	452	m_dac->write_unsigned8(data);
332	453	}
333	454
334		static const pia6821_interface pia4_intf =
	455	static const pia6821_interface pias_intf =
335	456	{
336	457	DEVCB_NULL, /* port A in */
337	458	DEVCB_DRIVER_MEMBER(s6_state, dac_r), /* port B in */
338	459	DEVCB_NULL, /* line CA1 in */
339		DEVCB_DRIVER_LINE_MEMBER(s6_state, cb1_r), /* line CB1 in */
	460	DEVCB_DRIVER_LINE_MEMBER(s6_state, pias_cb1_r), /* line CB1 in */
340	461	DEVCB_NULL, /* line CA2 in */
341	462	DEVCB_NULL, /* line CB2 in */
342	463	DEVCB_DRIVER_MEMBER(s6_state, dac_w), /* port A out */
343		DEVCB_NULL, /* port B out */
344		DEVCB_NULL, /* line CA2 out */
345		DEVCB_NULL, /* port CB2 out */
	464	DEVCB_DRIVER_MEMBER(s6_state, pias_pb_w), /* port B out */
	465	DEVCB_DRIVER_LINE_MEMBER(s6_state, pias_ca2_w), /* line CA2 out */
	466	DEVCB_DRIVER_LINE_MEMBER(s6_state, pias_cb2_w), /* line CB2 out */
346	467	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */
347	468	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */
348	469	};
r18808	r18809
359	480	/* basic machine hardware */
360	481	MCFG_CPU_ADD("maincpu", M6802, 3580000) // 6802 or 6808 could be used here
361	482	MCFG_CPU_PROGRAM_MAP(s6_main_map)
362		MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s6_state, irq, attotime::from_hz(~~100~~0))
	483	MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s6_state, irq, attotime::from_hz(250))
363	484	MCFG_MACHINE_RESET_OVERRIDE(s6_state, s6)
364	485
365	486	/* Video */
r18808	r18809
369	490	MCFG_FRAGMENT_ADD( genpin_audio )
370	491
371	492	/* Devices */
372		MCFG_PIA6821_ADD("pia0", pia0_intf)
373		MCFG_PIA6821_ADD("pia1", pia1_intf)
374		MCFG_PIA6821_ADD("pia2", pia2_intf)
375		MCFG_PIA6821_ADD("pia3", pia3_intf)
	493	MCFG_PIA6821_ADD("pia22", pia22_intf)
	494	MCFG_PIA6821_ADD("pia24", pia24_intf)
	495	MCFG_PIA6821_ADD("pia28", pia28_intf)
	496	MCFG_PIA6821_ADD("pia30", pia30_intf)
376	497	MCFG_NVRAM_ADD_1FILL("nvram")
377	498
378	499	/* Add the soundcard */
r18808	r18809
380	501	MCFG_CPU_PROGRAM_MAP(s6_audio_map)
381	502	MCFG_SPEAKER_STANDARD_MONO("mono")
382	503	MCFG_SOUND_ADD("dac", DAC, 0)
383		MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
384		MCFG_PIA6821_ADD("pia4", pia4_intf)
	504	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
	505	MCFG_SPEAKER_STANDARD_MONO("speech")
	506	MCFG_SOUND_ADD("hc55516", HC55516, 0)
	507	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
	508	MCFG_PIA6821_ADD("pias", pias_intf)
385	509	MACHINE_CONFIG_END
386	510
387		/*--------------------------------
388		/ Tri Zone - Sys.4 (Game #487)
389		/-------------------------------*/
390		ROM_START(trizn_l1)
391		ROM_REGION(0x10000, "maincpu", 0)
392		ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(757091c5) SHA1(00dac6c19b08d2528ea293619c4a39499a1a02c2))
393		ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
394		ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
395	511
396		ROM_REGION(0x10000, "audiocpu", 0)
397		ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
398		ROM_END
399
400		ROM_START(trizn_t1)
401		ROM_REGION(0x10000, "maincpu", 0)
402		ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(757091c5) SHA1(00dac6c19b08d2528ea293619c4a39499a1a02c2))
403		ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
404		ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
405
406		ROM_REGION(0x10000, "audiocpu", 0)
407		ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
408		ROM_END
409
410	512	/*--------------------------------
411		/ Time Warp - Sys.4 (Game #489)
412		/-------------------------------*/
413		ROM_START(tmwrp_l2)
414		ROM_REGION(0x10000, "maincpu", 0)
415		ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(b168df09) SHA1(d4c97714636ce51be2e5f8cc5af89e10a2f82ac7))
416		ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
417		ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
418
419		ROM_REGION(0x10000, "audiocpu", 0)
420		ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
421		ROM_END
422
423		ROM_START(tmwrp_t2)
424		ROM_REGION(0x10000, "maincpu", 0)
425		ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(b168df09) SHA1(d4c97714636ce51be2e5f8cc5af89e10a2f82ac7))
426		ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
427		ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
428
429		ROM_REGION(0x10000, "audiocpu", 0)
430		ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
431		ROM_END
432
433		/*--------------------------------
434	513	/ Laser Ball - Sys.6 (Game #493)
435	514	/-------------------------------*/
436	515	ROM_START(lzbal_l2)
r18808	r18809
440	519	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
441	520
442	521	ROM_REGION(0x10000, "audiocpu", 0)
443		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	522	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
444	523	ROM_END
445	524
446	525	ROM_START(lzbal_t2)
r18808	r18809
450	529	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
451	530
452	531	ROM_REGION(0x10000, "audiocpu", 0)
453		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	532	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
454	533	ROM_END
455	534
456		/*-----------------------------
457		/ Scorpion - Sys.6 (Game #494)
458		/----------------------------*/
459		ROM_START(scrpn_l1)
460		ROM_REGION(0x10000, "maincpu", 0)
461		ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(881109a9) SHA1(53d4275c76b47b68a74209fe660d943a51e90eca))
462		ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
463		ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
464	535
465		ROM_REGION(0x10000, "audiocpu", 0)
466		ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
467		ROM_END
468
469		ROM_START(scrpn_t1)
470		ROM_REGION(0x10000, "maincpu", 0)
471		ROM_LOAD("gamerom.716", 0x6000, 0x0800, CRC(881109a9) SHA1(53d4275c76b47b68a74209fe660d943a51e90eca))
472		ROM_LOAD("green1.716", 0x7000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
473		ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
474
475		ROM_REGION(0x10000, "audiocpu", 0)
476		ROM_LOAD("sound1.716", 0x7800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
477		ROM_END
478
479	536	/*----------------------------
480	537	/ Blackout - Sys.6 (Game #495)
481	538	/---------------------------*/
r18808	r18809
486	543	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
487	544
488	545	ROM_REGION(0x10000, "audiocpu", 0)
489		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(87864071) SHA1(d03c71efc0431f30a07c8194c0614c96fb683710))
490		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(046a96d8) SHA1(879127a88b3640bbb202c64cbf8678869c964177))
491		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(0104e5c4) SHA1(c073cb4bdea189085ae074e9c16872752b6ffba0))
492		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	546	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(87864071) SHA1(d03c71efc0431f30a07c8194c0614c96fb683710))
	547	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(046a96d8) SHA1(879127a88b3640bbb202c64cbf8678869c964177))
	548	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(0104e5c4) SHA1(c073cb4bdea189085ae074e9c16872752b6ffba0))
	549	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
493	550	ROM_END
494	551
495	552	ROM_START(blkou_t1)
r18808	r18809
499	556	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
500	557
501	558	ROM_REGION(0x10000, "audiocpu", 0)
502		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(87864071) SHA1(d03c71efc0431f30a07c8194c0614c96fb683710))
503		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(046a96d8) SHA1(879127a88b3640bbb202c64cbf8678869c964177))
504		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(0104e5c4) SHA1(c073cb4bdea189085ae074e9c16872752b6ffba0))
505		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	559	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(87864071) SHA1(d03c71efc0431f30a07c8194c0614c96fb683710))
	560	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(046a96d8) SHA1(879127a88b3640bbb202c64cbf8678869c964177))
	561	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(0104e5c4) SHA1(c073cb4bdea189085ae074e9c16872752b6ffba0))
	562	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
506	563	ROM_END
507	564
508	565	ROM_START(blkou_f1)
r18808	r18809
512	569	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
513	570
514	571	ROM_REGION(0x10000, "audiocpu", 0)
515		ROM_LOAD("speech7f.532", 0x3000, 0x1000, CRC(bdc1b0b1) SHA1(c78f8653dfe3ec58722a8a17da7924e4a76cf692))
516		ROM_LOAD("speech6f.532", 0x4000, 0x1000, CRC(9b7e4ae9) SHA1(137b5ec871162329cb7ca3a62da3193382223d8a))
517		ROM_LOAD("speech5f.532", 0x5000, 0x1000, CRC(9040f34a) SHA1(529eae0b58f3300f2b9bdf40c5ca7f4b29425dff))
518		ROM_LOAD("speech4f.532", 0x6000, 0x1000, CRC(29c4abde) SHA1(b3af7b8d0c2548f5c0bb240aa1dc5cc59bb2af9a))
519		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	572	ROM_LOAD("speech7f.532", 0xb000, 0x1000, CRC(bdc1b0b1) SHA1(c78f8653dfe3ec58722a8a17da7924e4a76cf692))
	573	ROM_LOAD("speech6f.532", 0xc000, 0x1000, CRC(9b7e4ae9) SHA1(137b5ec871162329cb7ca3a62da3193382223d8a))
	574	ROM_LOAD("speech5f.532", 0xd000, 0x1000, CRC(9040f34a) SHA1(529eae0b58f3300f2b9bdf40c5ca7f4b29425dff))
	575	ROM_LOAD("speech4f.532", 0xe000, 0x1000, CRC(29c4abde) SHA1(b3af7b8d0c2548f5c0bb240aa1dc5cc59bb2af9a))
	576	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
520	577	ROM_END
521	578
522	579	/*--------------------------
r18808	r18809
529	586	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
530	587
531	588	ROM_REGION(0x10000, "audiocpu", 0)
532		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(0b1879e3) SHA1(2c34a815f598b4413e9229e8eb1322ec9e7cc9d6))
533		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(0ceaef37) SHA1(33b5f5286b8588162d56dbc5c9a8ccb70d3b9090))
534		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(218290b9) SHA1(6afeff1413895489e92a4bb1c05f6de5773dbb6a))
535		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	589	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(0b1879e3) SHA1(2c34a815f598b4413e9229e8eb1322ec9e7cc9d6))
	590	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(0ceaef37) SHA1(33b5f5286b8588162d56dbc5c9a8ccb70d3b9090))
	591	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(218290b9) SHA1(6afeff1413895489e92a4bb1c05f6de5773dbb6a))
	592	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
536	593	ROM_END
537	594
538	595	ROM_START(grgar_t1)
r18808	r18809
542	599	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
543	600
544	601	ROM_REGION(0x10000, "audiocpu", 0)
545		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(0b1879e3) SHA1(2c34a815f598b4413e9229e8eb1322ec9e7cc9d6))
546		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(0ceaef37) SHA1(33b5f5286b8588162d56dbc5c9a8ccb70d3b9090))
547		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(218290b9) SHA1(6afeff1413895489e92a4bb1c05f6de5773dbb6a))
548		ROM_LOAD("sound2.716", 0x7800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
	602	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(0b1879e3) SHA1(2c34a815f598b4413e9229e8eb1322ec9e7cc9d6))
	603	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(0ceaef37) SHA1(33b5f5286b8588162d56dbc5c9a8ccb70d3b9090))
	604	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(218290b9) SHA1(6afeff1413895489e92a4bb1c05f6de5773dbb6a))
	605	ROM_LOAD("sound2.716", 0xf800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
549	606	ROM_END
550	607
551	608	/*-------------------------------
r18808	r18809
561	618	ROM_LOAD("prom1_6.474", 0x6000, 0x0200, CRC(af6eb0b9) SHA1(28f8366737e09ffd60cb5ea55a5734143cdb9663))
562	619
563	620	ROM_REGION(0x10000, "audiocpu", 0)
564		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
565		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
566		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
567		ROM_LOAD("sound3.716", 0x7800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
	621	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
	622	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
	623	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
	624	ROM_LOAD("sound3.716", 0xf800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
568	625	ROM_END
569	626
570	627	ROM_START(frpwr_t6)
r18808	r18809
577	634	ROM_LOAD("green2a.716", 0x7800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
578	635
579	636	ROM_REGION(0x10000, "audiocpu", 0)
580		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
581		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
582		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
583		ROM_LOAD("sound3.716", 0x7800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
	637	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
	638	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
	639	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
	640	ROM_LOAD("sound3.716", 0xf800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
584	641	ROM_END
585	642
586	643	ROM_START(frpwr_l2)
r18808	r18809
593	650	ROM_LOAD("green2.716", 0x7800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
594	651
595	652	ROM_REGION(0x10000, "audiocpu", 0)
596		ROM_LOAD("v_ic7.532", 0x3000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
597		ROM_LOAD("v_ic5.532", 0x4000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
598		ROM_LOAD("v_ic6.532", 0x5000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
599		ROM_LOAD("sound3.716", 0x7800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
	653	ROM_LOAD("v_ic7.532", 0xb000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
	654	ROM_LOAD("v_ic5.532", 0xc000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
	655	ROM_LOAD("v_ic6.532", 0xd000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
	656	ROM_LOAD("sound3.716", 0xf800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
600	657	ROM_END
601	658
602	659
603		GAME( 1978, trizn_l1, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Tri Zone (L-1)", GAME_IS_SKELETON_MECHANICAL)
604		GAME( 1978, trizn_t1, trizn_l1, s6, s6, driver_device, 0,ROT0, "Williams", "Tri Zone (T-1)", GAME_IS_SKELETON_MECHANICAL)
605		GAME( 1979, tmwrp_l2, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Time Warp (L-2)", GAME_IS_SKELETON_MECHANICAL)
606		GAME( 1979, tmwrp_t2, tmwrp_l2, s6, s6, driver_device, 0,ROT0, "Williams", "Time Warp (T-2)", GAME_IS_SKELETON_MECHANICAL)
607		GAME( 1979, lzbal_l2, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Laser Ball (L-2)", GAME_IS_SKELETON_MECHANICAL)
608		GAME( 1980, lzbal_t2, lzbal_l2, s6, s6, driver_device, 0,ROT0, "Williams", "Laser Ball (T-2)", GAME_IS_SKELETON_MECHANICAL)
609		GAME( 1980, scrpn_l1, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Scorpion (L-1)", GAME_IS_SKELETON_MECHANICAL)
610		GAME( 1980, scrpn_t1, scrpn_l1, s6, s6, driver_device, 0,ROT0, "Williams", "Scorpion (T-1)", GAME_IS_SKELETON_MECHANICAL)
611		GAME( 1979, blkou_l1, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Blackout (L-1)", GAME_IS_SKELETON_MECHANICAL)
612		GAME( 1979, blkou_t1, blkou_l1, s6, s6, driver_device, 0,ROT0, "Williams", "Blackout (T-1)", GAME_IS_SKELETON_MECHANICAL)
613		GAME( 1979, blkou_f1, blkou_l1, s6, s6, driver_device, 0,ROT0, "Williams", "Blackout (L-1, French Speech)", GAME_IS_SKELETON_MECHANICAL)
614		GAME( 1979, grgar_l1, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Gorgar (L-1)", GAME_IS_SKELETON_MECHANICAL)
615		GAME( 1979, grgar_t1, grgar_l1, s6, s6, driver_device, 0,ROT0, "Williams", "Gorgar (T-1)", GAME_IS_SKELETON_MECHANICAL)
616		GAME( 1980, frpwr_l6, 0, s6, s6, driver_device, 0,ROT0, "Williams", "Firepower (L-6)", GAME_IS_SKELETON_MECHANICAL)
617		GAME( 1980, frpwr_t6, frpwr_l6, s6, s6, driver_device, 0,ROT0, "Williams", "Firepower (T-6)", GAME_IS_SKELETON_MECHANICAL)
618		GAME( 1980, frpwr_l2, frpwr_l6, s6, s6, driver_device, 0,ROT0, "Williams", "Firepower (L-2)", GAME_IS_SKELETON_MECHANICAL)
	660	GAME( 1979, lzbal_l2, 0, s6, s6, driver_device, 0, ROT0, "Williams", "Laser Ball (L-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
	661	GAME( 1980, lzbal_t2, lzbal_l2, s6, s6, driver_device, 0, ROT0, "Williams", "Laser Ball (T-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
	662	GAME( 1979, blkou_l1, 0, s6, s6, driver_device, 0, ROT0, "Williams", "Blackout (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	663	GAME( 1979, blkou_t1, blkou_l1, s6, s6, driver_device, 0, ROT0, "Williams", "Blackout (T-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	664	GAME( 1979, blkou_f1, blkou_l1, s6, s6, driver_device, 0, ROT0, "Williams", "Blackout (L-1, French Speech)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	665	GAME( 1979, grgar_l1, 0, s6, s6, driver_device, 0, ROT0, "Williams", "Gorgar (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	666	GAME( 1979, grgar_t1, grgar_l1, s6, s6, driver_device, 0, ROT0, "Williams", "Gorgar (T-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	667	GAME( 1980, frpwr_l6, 0, s6, s6, driver_device, 0, ROT0, "Williams", "Firepower (L-6)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	668	GAME( 1980, frpwr_t6, frpwr_l6, s6, s6, driver_device, 0, ROT0, "Williams", "Firepower (T-6)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	669	GAME( 1980, frpwr_l2, frpwr_l6, s6, s6, driver_device, 0, ROT0, "Williams", "Firepower (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)

trunk/src/mame/drivers/s8.c
r18808	r18809
55	55	m_maincpu(*this, "maincpu"),
56	56	m_audiocpu(*this, "audiocpu"),
57	57	m_dac(*this, "dac"),
58		m_pia(*this, "pia"),
	58	m_pias(*this, "pias"),
59	59	m_pia21(*this, "pia21"),
60	60	m_pia24(*this, "pia24"),
61	61	m_pia28(*this, "pia28"),
r18808	r18809
74	74	DECLARE_READ8_MEMBER(dips_r);
75	75	DECLARE_READ8_MEMBER(switch_r);
76	76	DECLARE_WRITE8_MEMBER(switch_w);
77		DECLARE_READ_LINE_MEMBER(pia_ca1_r);
	77	DECLARE_READ_LINE_MEMBER(pias_ca1_r);
78	78	DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
79	79	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
80	80	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
81		DECLARE_WRITE_LINE_MEMBER(pia_ca2_w);
82		DECLARE_WRITE_LINE_MEMBER(pia_cb2_w);
	81	DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
	82	DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
83	83	DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
84	84	DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
85	85	DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; // dummy to stop error log filling up
r18808	r18809
93	93
94	94	// devices
95	95	required_device<cpu_device> m_maincpu;
96		optional_device<cpu_device> m_audiocpu;
97		optional_device<dac_device> m_dac;
98		optional_device<pia6821_device> m_pia;
	96	required_device<cpu_device> m_audiocpu;
	97	required_device<dac_device> m_dac;
	98	required_device<pia6821_device> m_pias;
99	99	required_device<pia6821_device> m_pia21;
100	100	required_device<pia6821_device> m_pia24;
101	101	required_device<pia6821_device> m_pia28;
r18808	r18809
122	122
123	123	static ADDRESS_MAP_START( s8_audio_map, AS_PROGRAM, 8, s8_state )
124	124	AM_RANGE(0x0000, 0x00ff) AM_RAM
125		AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE("pia", pia6821_device, read, write) // stillcra sounds
126		AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("pia", pia6821_device, read, write) // pfevr sounds
	125	AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE("pias", pia6821_device, read, write) // stillcra sounds
	126	AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("pias", pia6821_device, read, write) // pfevr sounds
127	127	AM_RANGE(0x8000, 0xffff) AM_ROM
128	128	ADDRESS_MAP_END
129	129
r18808	r18809
244	244	{
245	245	// sound ns
246	246	m_ca1 = state;
247		m_pia->ca1_w(m_ca1);
	247	m_pias->ca1_w(m_ca1);
248	248	}
249	249
250	250	static const pia6821_interface pia21_intf =
r18808	r18809
358	358	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
359	359	};
360	360
361		READ_LINE_MEMBER( s8_state::pia_ca1_r )
	361	READ_LINE_MEMBER( s8_state::pias_ca1_r )
362	362	{
363	363	return m_ca1;
364	364	}
365	365
366		WRITE_LINE_MEMBER( s8_state::pia_ca2_w )
	366	WRITE_LINE_MEMBER( s8_state::pias_ca2_w )
367	367	{
368	368	// speech clock
369	369	}
370	370
371		WRITE_LINE_MEMBER( s8_state::pia_cb2_w )
	371	WRITE_LINE_MEMBER( s8_state::pias_cb2_w )
372	372	{
373	373	// speech data
374	374	}
r18808	r18809
383	383	m_dac->write_unsigned8(data);
384	384	}
385	385
386		static const pia6821_interface pia_intf =
	386	static const pia6821_interface pias_intf =
387	387	{
388	388	DEVCB_DRIVER_MEMBER(s8_state, dac_r), /* port A in */
389	389	DEVCB_NULL, /* port B in */
390		DEVCB_DRIVER_LINE_MEMBER(s8_state, pia_ca1_r), /* line CA1 in */
	390	DEVCB_DRIVER_LINE_MEMBER(s8_state, pias_ca1_r), /* line CA1 in */
391	391	DEVCB_LINE_GND, /* line CB1 in */
392	392	DEVCB_NULL, /* line CA2 in */
393	393	DEVCB_NULL, /* line CB2 in */
394	394	DEVCB_DRIVER_MEMBER(s8_state, sound_w), /* port A out */
395	395	DEVCB_DRIVER_MEMBER(s8_state, dac_w), /* port B out */
396		DEVCB_DRIVER_LINE_MEMBER(s8_state, pia_ca2_w), /* line CA2 out */
397		DEVCB_DRIVER_LINE_MEMBER(s8_state, pia_cb2_w), /* line CB2 out */
	396	DEVCB_DRIVER_LINE_MEMBER(s8_state, pias_ca2_w), /* line CA2 out */
	397	DEVCB_DRIVER_LINE_MEMBER(s8_state, pias_cb2_w), /* line CB2 out */
398	398	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */
399	399	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */
400	400	};
r18808	r18809
432	432	MCFG_SPEAKER_STANDARD_MONO("mono")
433	433	MCFG_SOUND_ADD("dac", DAC, 0)
434	434	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
435		MCFG_PIA6821_ADD("pia", pia_intf)
	435	MCFG_PIA6821_ADD("pias", pias_intf)
436	436	MACHINE_CONFIG_END
437	437
438	438	/*------------------------------

trunk/src/mame/drivers/s6a.c
r18808	r18809
32	32	m_audiocpu(*this, "audiocpu"),
33	33	m_dac(*this, "dac"),
34	34	m_hc55516(*this, "hc55516"),
35		m_pia(*this, "pia"),
	35	m_pias(*this, "pias"),
36	36	m_pia22(*this, "pia22"),
37	37	m_pia24(*this, "pia24"),
38	38	m_pia28(*this, "pia28"),
r18808	r18809
52	52	DECLARE_WRITE8_MEMBER(switch_w);
53	53	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
54	54	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
55		DECLARE_READ_LINE_MEMBER(pia_cb1_r);
56		DECLARE_WRITE_LINE_MEMBER(pia_ca2_w);
57		DECLARE_WRITE_LINE_MEMBER(pia_cb2_w);
	55	DECLARE_READ_LINE_MEMBER(pias_cb1_r);
	56	DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
	57	DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
58	58	DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
59	59	DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
60	60	DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
r18808	r18809
74	74	required_device<cpu_device> m_audiocpu;
75	75	required_device<dac_device> m_dac;
76	76	required_device<hc55516_device> m_hc55516;
77		required_device<pia6821_device> m_pia;
	77	required_device<pia6821_device> m_pias;
78	78	required_device<pia6821_device> m_pia22;
79	79	required_device<pia6821_device> m_pia24;
80	80	required_device<pia6821_device> m_pia28;
r18808	r18809
101	101
102	102	static ADDRESS_MAP_START( s6a_audio_map, AS_PROGRAM, 8, s6a_state )
103	103	AM_RANGE(0x0000, 0x00ff) AM_RAM
104		AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia", pia6821_device, read, write) ~~// sounds~~
	104	AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pias", pia6821_device, read, write)
105	105	AM_RANGE(0xA000, 0xffff) AM_ROM
106	106	ADDRESS_MAP_END
107	107
r18808	r18809
283	283	if (BIT(data, 4))
284	284	m_sound_data &= 0x7f;
285	285
286		m_cb1 = ((m_sound_data & 0x7f) != 0x7f);
	286	m_cb1 = ((m_sound_data & 0x9f) != 0x9f);
287	287
288		m_pia->cb1_w(m_cb1);
	288	m_pias->cb1_w(m_cb1);
289	289
290	290	// if (BIT(data, 5))
291	291	// m_samples->start(0, 6); // knocker
r18808	r18809
428	428	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
429	429	};
430	430
431		READ_LINE_MEMBER( s6a_state::pia_cb1_r )
	431	READ_LINE_MEMBER( s6a_state::pias_cb1_r )
432	432	{
433	433	return m_cb1;
434	434	}
435	435
436		WRITE_LINE_MEMBER( s6a_state::pia_cb2_w )
	436	WRITE_LINE_MEMBER( s6a_state::pias_cb2_w )
437	437	{
438	438	// speech clock
439	439	hc55516_clock_w(m_hc55516, state);
440	440	}
441	441
442		WRITE_LINE_MEMBER( s6a_state::pia_ca2_w )
	442	WRITE_LINE_MEMBER( s6a_state::pias_ca2_w )
443	443	{
444	444	// speech data
445	445	hc55516_digit_w(m_hc55516, state);
r18808	r18809
455	455	m_dac->write_unsigned8(data);
456	456	}
457	457
458		static const pia6821_interface pia_intf =
	458	static const pia6821_interface pias_intf =
459	459	{
460	460	DEVCB_NULL, /* port A in */
461	461	DEVCB_DRIVER_MEMBER(s6a_state, dac_r), /* port B in */
462	462	DEVCB_NULL, /* line CA1 in */
463		DEVCB_DRIVER_LINE_MEMBER(s6a_state, pia_cb1_r), /* line CB1 in */
	463	DEVCB_DRIVER_LINE_MEMBER(s6a_state, pias_cb1_r), /* line CB1 in */
464	464	DEVCB_NULL, /* line CA2 in */
465	465	DEVCB_NULL, /* line CB2 in */
466	466	DEVCB_DRIVER_MEMBER(s6a_state, dac_w), /* port A out */
467	467	DEVCB_NULL, /* port B out */
468		DEVCB_DRIVER_LINE_MEMBER(s6a_state, pia_ca2_w), /* line CA2 out */
469		DEVCB_DRIVER_LINE_MEMBER(s6a_state, pia_cb2_w), /* line CB2 out */
	468	DEVCB_DRIVER_LINE_MEMBER(s6a_state, pias_ca2_w), /* line CA2 out */
	469	DEVCB_DRIVER_LINE_MEMBER(s6a_state, pias_cb2_w), /* line CB2 out */
470	470	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */
471	471	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */
472	472	};
r18808	r18809
503	503	MCFG_CPU_PROGRAM_MAP(s6a_audio_map)
504	504	MCFG_SPEAKER_STANDARD_MONO("mono")
505	505	MCFG_SOUND_ADD("dac", DAC, 0)
506		MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
	506	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
507	507	MCFG_SPEAKER_STANDARD_MONO("speech")
508	508	MCFG_SOUND_ADD("hc55516", HC55516, 0)
509	509	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
510		MCFG_PIA6821_ADD("pia", pia_intf)
	510	MCFG_PIA6821_ADD("pias", pias_intf)
511	511	MACHINE_CONFIG_END
512	512
513	513
r18808	r18809
568	568	ROM_END
569	569
570	570
571		GAME(1980,algar_l1, 0, s6a, s6a, driver_device, 0, ROT0, "Williams", "Algar (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING)
572		GAME(1980,alpok_l6, 0, s6a, s6a, driver_device, 0, ROT0, "Williams", "Alien Poker (L-6)", GAME_MECHANICAL \| GAME_NOT_WORKING)
573		GAME(1980,alpok_l2, alpok_l6,s6a, s6a, driver_device, 0, ROT0, "Williams", "Alien Poker (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING)
574		GAME(1980,alpok_f6, alpok_l6,s6a, s6a, driver_device, 0, ROT0, "Williams", "Alien Poker (L-6 French speech)", GAME_MECHANICAL \| GAME_NOT_WORKING)
	571	GAME(1980,algar_l1, 0, s6a, s6a, driver_device, 0, ROT0, "Williams", "Algar (L-1)", GAME_MECHANICAL \| GAME_NO_SOUND)
	572	GAME(1980,alpok_l6, 0, s6a, s6a, driver_device, 0, ROT0, "Williams", "Alien Poker (L-6)", GAME_MECHANICAL \| GAME_NO_SOUND)
	573	GAME(1980,alpok_l2, alpok_l6,s6a, s6a, driver_device, 0, ROT0, "Williams", "Alien Poker (L-2)", GAME_MECHANICAL \| GAME_NO_SOUND)
	574	GAME(1980,alpok_f6, alpok_l6,s6a, s6a, driver_device, 0, ROT0, "Williams", "Alien Poker (L-6 French speech)", GAME_MECHANICAL \| GAME_NO_SOUND)

trunk/src/mame/drivers/s3.c
r18808	r18809
37	37	m_maincpu(*this, "maincpu"),
38	38	m_audiocpu(*this, "audiocpu"),
39	39	m_dac(*this, "dac"),
40		m_pia0(*this, "pia0"),
41		m_pia1(*this, "pia1"),
42		m_pia2(*this, "pia2"),
43		m_pia3(*this, "pia3"),
44		m_pia4(*this, "pia4")
	40	m_pia22(*this, "pia22"),
	41	m_pia24(*this, "pia24"),
	42	m_pia28(*this, "pia28"),
	43	m_pia30(*this, "pia30"),
	44	m_pias(*this, "pias")
45	45	{ }
46	46
47	47	DECLARE_READ8_MEMBER(dac_r);
r18808	r18809
55	55	DECLARE_READ8_MEMBER(dips_r);
56	56	DECLARE_READ8_MEMBER(switch_r);
57	57	DECLARE_WRITE8_MEMBER(switch_w);
58		DECLARE_READ_LINE_MEMBER(pia2_ca1_r);
59		DECLARE_READ_LINE_MEMBER(pia2_cb1_r);
60		DECLARE_READ_LINE_MEMBER(pia4_cb1_r);
61		DECLARE_WRITE_LINE_MEMBER(pia0_ca2_w) { }; //ST5
62		DECLARE_WRITE_LINE_MEMBER(pia0_cb2_w) { }; //ST-solenoids enable
63		DECLARE_WRITE_LINE_MEMBER(pia1_ca2_w) { }; //ST2
64		DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w) { }; //ST1
65		DECLARE_WRITE_LINE_MEMBER(pia2_ca2_w) { }; //diag leds enable
66		DECLARE_WRITE_LINE_MEMBER(pia2_cb2_w) { }; //ST6
67		DECLARE_WRITE_LINE_MEMBER(pia3_ca2_w) { }; //ST4
68		DECLARE_WRITE_LINE_MEMBER(pia3_cb2_w) { }; //ST3
	58	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
	59	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
	60	DECLARE_READ_LINE_MEMBER(pias_cb1_r);
	61	DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
	62	DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
	63	DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
	64	DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; //ST1
	65	DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; //diag leds enable
	66	DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; //ST6
	67	DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
	68	DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
69	69	TIMER_DEVICE_CALLBACK_MEMBER(irq);
70	70	DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
71	71	DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
r18808	r18809
77	77	required_device<cpu_device> m_maincpu;
78	78	optional_device<cpu_device> m_audiocpu;
79	79	optional_device<dac_device> m_dac;
80		required_device<pia6821_device> m_pia0;
81		required_device<pia6821_device> m_pia1;
82		required_device<pia6821_device> m_pia2;
83		required_device<pia6821_device> m_pia3;
84		optional_device<pia6821_device> m_pia4;
	80	required_device<pia6821_device> m_pia22;
	81	required_device<pia6821_device> m_pia24;
	82	required_device<pia6821_device> m_pia28;
	83	required_device<pia6821_device> m_pia30;
	84	optional_device<pia6821_device> m_pias;
85	85	private:
86	86	UINT8 m_t_c;
87	87	UINT8 m_sound_data;
r18808	r18809
96	96	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
97	97	AM_RANGE(0x0000, 0x00ff) AM_RAM
98	98	AM_RANGE(0x0100, 0x01ff) AM_RAM AM_SHARE("nvram")
99		AM_RANGE(0x2200, 0x2203) AM_DEVREADWRITE("pia0", pia6821_device, read, write) // solenoids
100		AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia1", pia6821_device, read, write) // lamps
101		AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia2", pia6821_device, read, write) // display
102		AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia3", pia6821_device, read, write) // inputs
	99	AM_RANGE(0x2200, 0x2203) AM_DEVREADWRITE("pia22", pia6821_device, read, write) // solenoids
	100	AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps
	101	AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display
	102	AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs
103	103	AM_RANGE(0x6000, 0x7fff) AM_ROM
104	104	ADDRESS_MAP_END
105	105
106	106	static ADDRESS_MAP_START( s3_audio_map, AS_PROGRAM, 8, s3_state )
107	107	ADDRESS_MAP_GLOBAL_MASK(0xfff)
108	108	AM_RANGE(0x0000, 0x007f) AM_RAM
109		AM_RANGE(0x0400, 0x0403) AM_DEVREADWRITE("pia4", pia6821_device, read, write) // sounds
	109	AM_RANGE(0x0400, 0x0403) AM_DEVREADWRITE("pias", pia6821_device, read, write) // sounds
110	110	AM_RANGE(0x0800, 0x0fff) AM_ROM
111	111	ADDRESS_MAP_END
112	112
r18808	r18809
312	312	m_sound_data &= 0x7f;
313	313
314	314
315		m_cb1 = ((m_sound_data & 0x7f) != 0x7f);
	315	m_cb1 = ((m_sound_data & 0x9f) != 0x9f);
316	316
317		m_pia4->cb1_w(!m_cb1);
	317	m_pias->cb1_w(m_cb1);
318	318	}
319	319
320	320	if (BIT(data, 5))
321	321	m_samples->start(0, 6); // knocker
322	322	}
323	323
324		static const pia6821_interface pia0_intf =
	324	static const pia6821_interface pia22_intf =
325	325	{
326	326	DEVCB_NULL, /* port A in */
327	327	DEVCB_NULL, /* port B in */
r18808	r18809
331	331	DEVCB_NULL, /* line CB2 in */
332	332	DEVCB_DRIVER_MEMBER(s3_state, sol0_w), /* port A out */
333	333	DEVCB_DRIVER_MEMBER(s3_state, sol1_w), /* port B out */
334		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia0_ca2_w), /* line CA2 out */
335		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia0_cb2_w), /* line CB2 out */
	334	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia22_ca2_w), /* line CA2 out */
	335	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia22_cb2_w), /* line CB2 out */
336	336	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
337	337	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
338	338	};
r18808	r18809
346	346	{
347	347	}
348	348
349		static const pia6821_interface pia1_intf =
	349	static const pia6821_interface pia24_intf =
350	350	{
351	351	DEVCB_NULL, /* port A in */
352	352	DEVCB_NULL, /* port B in */
r18808	r18809
356	356	DEVCB_NULL, /* line CB2 in */
357	357	DEVCB_DRIVER_MEMBER(s3_state, lamp0_w), /* port A out */
358	358	DEVCB_DRIVER_MEMBER(s3_state, lamp1_w), /* port B out */
359		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia1_ca2_w), /* line CA2 out */
360		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia1_cb2_w), /* line CB2 out */
	359	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia24_ca2_w), /* line CA2 out */
	360	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia24_cb2_w), /* line CB2 out */
361	361	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
362	362	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
363	363	};
364	364
365		READ_LINE_MEMBER( s3_state::pia2_ca1_r )
	365	READ_LINE_MEMBER( s3_state::pia28_ca1_r )
366	366	{
367	367	return BIT(ioport("DIAGS")->read(), 2); // advance button
368	368	}
369	369
370		READ_LINE_MEMBER( s3_state::pia2_cb1_r )
	370	READ_LINE_MEMBER( s3_state::pia28_cb1_r )
371	371	{
372	372	return BIT(ioport("DIAGS")->read(), 3); // auto/manual switch
373	373	}
r18808	r18809
414	414	m_data_ok = false;
415	415	}
416	416
417		static const pia6821_interface pia2_intf =
	417	static const pia6821_interface pia28_intf =
418	418	{
419	419	DEVCB_DRIVER_MEMBER(s3_state, dips_r), /* port A in */
420	420	DEVCB_NULL, /* port B in */
421		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia2_ca1_r), /* line CA1 in */
422		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia2_cb1_r), /* line CB1 in */
	421	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_ca1_r), /* line CA1 in */
	422	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_cb1_r), /* line CB1 in */
423	423	DEVCB_NULL, /* line CA2 in */
424	424	DEVCB_NULL, /* line CB2 in */
425	425	DEVCB_DRIVER_MEMBER(s3_state, dig0_w), /* port A out */
426	426	DEVCB_DRIVER_MEMBER(s3_state, dig1_w), /* port B out */
427		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia2_ca2_w), /* line CA2 out */
428		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia2_cb2_w), /* line CB2 out */
	427	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_ca2_w), /* line CA2 out */
	428	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia28_cb2_w), /* line CB2 out */
429	429	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
430	430	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
431	431	};
r18808	r18809
442	442	m_kbdrow = data;
443	443	}
444	444
445		static const pia6821_interface pia3_intf =
	445	static const pia6821_interface pia30_intf =
446	446	{
447	447	DEVCB_DRIVER_MEMBER(s3_state, switch_r), /* port A in */
448	448	DEVCB_NULL, /* port B in */
r18808	r18809
452	452	DEVCB_NULL, /* line CB2 in */
453	453	DEVCB_NULL, /* port A out */
454	454	DEVCB_DRIVER_MEMBER(s3_state, switch_w), /* port B out */
455		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia3_ca2_w), /* line CA2 out */
456		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia3_cb2_w), /* line CB2 out */
	455	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia30_ca2_w), /* line CA2 out */
	456	DEVCB_DRIVER_LINE_MEMBER(s3_state, pia30_cb2_w), /* line CB2 out */
457	457	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */
458	458	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
459	459	};
460	460
461		READ_LINE_MEMBER( s3_state::pia4_cb1_r )
	461	READ_LINE_MEMBER( s3_state::pias_cb1_r )
462	462	{
463	463	return m_cb1;
464	464	}
r18808	r18809
473	473	m_dac->write_unsigned8(data);
474	474	}
475	475
476		static const pia6821_interface pia4_intf =
	476	static const pia6821_interface pias_intf =
477	477	{
478	478	DEVCB_NULL, /* port A in */
479	479	DEVCB_DRIVER_MEMBER(s3_state, dac_r), /* port B in */
480	480	DEVCB_NULL, /* line CA1 in */
481		DEVCB_DRIVER_LINE_MEMBER(s3_state, pia4_cb1_r), /* line CB1 in */
	481	DEVCB_DRIVER_LINE_MEMBER(s3_state, pias_cb1_r), /* line CB1 in */
482	482	DEVCB_NULL, /* line CA2 in */
483	483	DEVCB_NULL, /* line CB2 in */
484	484	DEVCB_DRIVER_MEMBER(s3_state, dac_w), /* port A out */
r18808	r18809
511	511	MCFG_FRAGMENT_ADD( genpin_audio )
512	512
513	513	/* Devices */
514		MCFG_PIA6821_ADD("pia0", pia0_intf)
515		MCFG_PIA6821_ADD("pia1", pia1_intf)
516		MCFG_PIA6821_ADD("pia2", pia2_intf)
517		MCFG_PIA6821_ADD("pia3", pia3_intf)
	514	MCFG_PIA6821_ADD("pia22", pia22_intf)
	515	MCFG_PIA6821_ADD("pia24", pia24_intf)
	516	MCFG_PIA6821_ADD("pia28", pia28_intf)
	517	MCFG_PIA6821_ADD("pia30", pia30_intf)
518	518	MCFG_NVRAM_ADD_1FILL("nvram")
519	519	MACHINE_CONFIG_END
520	520
r18808	r18809
526	526	MCFG_SPEAKER_STANDARD_MONO("mono")
527	527	MCFG_SOUND_ADD("dac", DAC, 0)
528	528	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
529		MCFG_PIA6821_ADD("pia4", pia4_intf)
	529	MCFG_PIA6821_ADD("pias", pias_intf)
530	530	MACHINE_CONFIG_END
531	531
532	532
r18808	r18809
620	620
621	621	GAME( 1977, httip_l1, 0, s3, s3, driver_device, 0, ROT0, "Williams", "Hot Tip (L-1)", GAME_MECHANICAL )
622	622	GAME( 1977, lucky_l1, 0, s3, s3, driver_device, 0, ROT0, "Williams", "Lucky Seven (L-1)", GAME_MECHANICAL )
623		GAME( 1978, wldcp_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "World Cup Soccer (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING)
624		GAME( 1978, cntct_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Contact (L-1)", GAME_MECHANICAL)
625		GAME( 1978, disco_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Disco Fever (L-1)", GAME_MECHANICAL)
626		GAME( 1978, phnix_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Phoenix (L-1)", GAME_MECHANICAL)
627		GAME( 1978, pkrno_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Pokerino (L-1)", GAME_MECHANICAL)
	623	GAME( 1978, wldcp_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "World Cup Soccer (L-1)", GAME_MECHANICAL )
	624	GAME( 1978, cntct_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Contact (L-1)", GAME_MECHANICAL )
	625	GAME( 1978, disco_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Disco Fever (L-1)", GAME_MECHANICAL )
	626	GAME( 1978, phnix_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Phoenix (L-1)", GAME_MECHANICAL )
	627	GAME( 1978, pkrno_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Pokerino (L-1)", GAME_MECHANICAL )

trunk/src/mame/drivers/s7.c
r18808	r18809
4	4	Williams System 7
5	5
6	6	Status of games:
	7	- Inputs don't work so unable to play.
	8	- Display works.
	9	- Sound test works.
7	10
8
9	11	ToDo:
10	12
11	13	*****************************************************************************************/
r18808	r18809
28	30	m_audiocpu(*this, "audiocpu"),
29	31	m_dac(*this, "dac"),
30	32	m_hc55516(*this, "hc55516"),
31		m_pia(*this, "pia"),
	33	m_pias(*this, "pias"),
32	34	m_pia21(*this, "pia21"),
33	35	m_pia22(*this, "pia22"),
34	36	m_pia24(*this, "pia24"),
r18808	r18809
50	52	DECLARE_READ8_MEMBER(dips_r);
51	53	DECLARE_READ8_MEMBER(switch_r);
52	54	DECLARE_WRITE8_MEMBER(switch_w);
53		DECLARE_READ_LINE_MEMBER(pia_ca1_r);
	55	DECLARE_READ_LINE_MEMBER(pias_ca1_r);
54	56	DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
55	57	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
56	58	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
57		DECLARE_WRITE_LINE_MEMBER(pia_ca2_w);
58		DECLARE_WRITE_LINE_MEMBER(pia_cb2_w);
	59	DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
	60	DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
59	61	DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w) { };
60	62	DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
61	63	DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
r18808	r18809
74	76
75	77	// devices
76	78	required_device<cpu_device> m_maincpu;
77		optional_device<cpu_device> m_audiocpu;
78		optional_device<dac_device> m_dac;
79		optional_device<hc55516_device> m_hc55516;
80		optional_device<pia6821_device> m_pia;
	79	required_device<cpu_device> m_audiocpu;
	80	required_device<dac_device> m_dac;
	81	required_device<hc55516_device> m_hc55516;
	82	required_device<pia6821_device> m_pias;
81	83	required_device<pia6821_device> m_pia21;
82	84	required_device<pia6821_device> m_pia22;
83	85	required_device<pia6821_device> m_pia24;
r18808	r18809
106	108
107	109	static ADDRESS_MAP_START( s7_audio_map, AS_PROGRAM, 8, s7_state )
108	110	AM_RANGE(0x0000, 0x00ff) AM_RAM
109		AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia", pia6821_device, read, write)
	111	AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pias", pia6821_device, read, write)
110	112	AM_RANGE(0xA000, 0xffff) AM_ROM
111	113	ADDRESS_MAP_END
112	114
r18808	r18809
242	244	MACHINE_RESET_MEMBER( s7_state, s7 )
243	245	{
244	246	m_t_c = 0;
245		// reset the IRQ state
246		m_pia->cb1_w(1);
247	247	}
248	248
249	249	INPUT_CHANGED_MEMBER( s7_state::main_nmi )
r18808	r18809
275	275	{
276	276	m_sound_data = data;
277	277	m_cb1 = ((m_sound_data & 0x8f) != 0x8f);
278		m_pia->cb1_w(m_cb1);
	278	m_pias->cb1_w(m_cb1);
279	279	}
280	280
281	281	static const pia6821_interface pia21_intf =
r18808	r18809
403	403	{
404	404	char kbdrow[8];
405	405	sprintf(kbdrow,"X%X",m_kbdrow);
406		return ioport(kbdrow)->read();
	406	return ~ioport(kbdrow)->read();
407	407	}
408	408
409	409	WRITE8_MEMBER( s7_state::switch_w )
r18808	r18809
427	427	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
428	428	};
429	429
430		WRITE_LINE_MEMBER( s7_state::pia_cb2_w )
	430	WRITE_LINE_MEMBER( s7_state::pias_cb2_w )
431	431	{
432	432	// speech clock
433	433	hc55516_clock_w(m_hc55516, state);
434	434	}
435	435
436		WRITE_LINE_MEMBER( s7_state::pia_ca2_w )
	436	WRITE_LINE_MEMBER( s7_state::pias_ca2_w )
437	437	{
438	438	// speech data
439	439	hc55516_digit_w(m_hc55516, state);
r18808	r18809
449	449	m_dac->write_unsigned8(data);
450	450	}
451	451
452		static const pia6821_interface pia_intf =
	452	static const pia6821_interface pias_intf =
453	453	{
454	454	DEVCB_NULL, /* port A in */
455	455	DEVCB_DRIVER_MEMBER(s7_state, dac_r), /* port B in */
r18808	r18809
459	459	DEVCB_NULL, /* line CB2 in */
460	460	DEVCB_DRIVER_MEMBER(s7_state, dac_w), /* port A out */
461	461	DEVCB_NULL, /* port B out */
462		DEVCB_DRIVER_LINE_MEMBER(s7_state, pia_ca2_w), /* line CA2 out */
463		DEVCB_DRIVER_LINE_MEMBER(s7_state, pia_cb2_w), /* line CB2 out */
	462	DEVCB_DRIVER_LINE_MEMBER(s7_state, pias_ca2_w), /* line CA2 out */
	463	DEVCB_DRIVER_LINE_MEMBER(s7_state, pias_cb2_w), /* line CB2 out */
464	464	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */
465	465	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */
466	466	};
r18808	r18809
502	502	MCFG_SPEAKER_STANDARD_MONO("speech")
503	503	MCFG_SOUND_ADD("hc55516", HC55516, 0)
504	504	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
505		MCFG_PIA6821_ADD("pia", pia_intf)
	505	MCFG_PIA6821_ADD("pias", pias_intf)
506	506	MACHINE_CONFIG_END
507	507
508	508
r18808	r18809
615	615	ROM_LOAD("ic17.532", 0x7000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
616	616
617	617	ROM_REGION(0x10000, "audiocpu", 0)
618		ROM_LOAD("sound12.716", 0x7800, 0x0800, CRC(05a2230c) SHA1(c57cd7628310aa8f68ca24217aad1ead066a1a82))
619		ROM_RELOAD( 0xf800, 0x0800)
	618	ROM_LOAD("sound12.716", 0xf800, 0x0800, CRC(05a2230c) SHA1(c57cd7628310aa8f68ca24217aad1ead066a1a82))
620	619	ROM_END
621	620
622	621	/*-----------------------------------
r18808	r18809
776	775
777	776
778	777
779		GAME( 1982, vrkon_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Varkon (L-1)", GAME_IS_SKELETON_MECHANICAL)
780		GAME( 1981, barra_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Barracora (L-1)", GAME_IS_SKELETON_MECHANICAL)
781		GAME( 1980, bk_l4, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Black Knight (L-4)", GAME_IS_SKELETON_MECHANICAL)
782		GAME( 1980, bk_f4, bk_l4, s7, s7, driver_device, 0, ROT0, "Williams", "Black Knight (L-4, French speech)", GAME_IS_SKELETON_MECHANICAL)
783		GAME( 1980, bk_l3, bk_l4, s7, s7, driver_device, 0, ROT0, "Williams", "Black Knight (L-3)", GAME_IS_SKELETON_MECHANICAL)
784		GAME( 1980, csmic_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Cosmic Gunfight (L-1)", GAME_IS_SKELETON_MECHANICAL)
785		GAME( 1982, dfndr_l4, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Defender (L-4)", GAME_IS_SKELETON_MECHANICAL)
786		GAME( 1983, fpwr2_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Firepower II (L-2)", GAME_IS_SKELETON_MECHANICAL)
787		GAME( 1981, hypbl_l4, 0, s7, s7, driver_device, 0, ROT0, "Williams", "HyperBall (L-4)", GAME_IS_SKELETON_MECHANICAL)
788		GAME( 1983, jst_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Joust (L-2)", GAME_IS_SKELETON_MECHANICAL)
789		GAME( 1981, jngld_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Jungle Lord (L-2)", GAME_IS_SKELETON_MECHANICAL)
790		GAME( 1983, lsrcu_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Laser Cue (L-2)", GAME_IS_SKELETON_MECHANICAL)
791		GAME( 1981, pharo_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Pharaoh (L-2)", GAME_IS_SKELETON_MECHANICAL)
792		GAME( 1981, solar_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Solar Fire (L-2)", GAME_IS_SKELETON_MECHANICAL)
793		GAME( 1984, strlt_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Star Light (L-1)", GAME_IS_SKELETON_MECHANICAL)
794		GAME( 1982, tmfnt_l5, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Time Fantasy (L-5)", GAME_IS_SKELETON_MECHANICAL)
795		GAME( 1982, wrlok_l3, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Warlok (L-3)", GAME_IS_SKELETON_MECHANICAL)
796		GAME( 1982, thund_p1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Thunderball (P-1)", GAME_IS_SKELETON_MECHANICAL)
	778	GAME( 1982, vrkon_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Varkon (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	779	GAME( 1981, barra_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Barracora (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	780	GAME( 1980, bk_l4, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Black Knight (L-4)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	781	GAME( 1980, bk_f4, bk_l4, s7, s7, driver_device, 0, ROT0, "Williams", "Black Knight (L-4, French speech)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	782	GAME( 1980, bk_l3, bk_l4, s7, s7, driver_device, 0, ROT0, "Williams", "Black Knight (L-3)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	783	GAME( 1980, csmic_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Cosmic Gunfight (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	784	GAME( 1982, dfndr_l4, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Defender (L-4)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	785	GAME( 1983, fpwr2_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Firepower II (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	786	GAME( 1981, hypbl_l4, 0, s7, s7, driver_device, 0, ROT0, "Williams", "HyperBall (L-4)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	787	GAME( 1983, jst_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Joust (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	788	GAME( 1981, jngld_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Jungle Lord (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	789	GAME( 1983, lsrcu_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Laser Cue (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	790	GAME( 1981, pharo_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Pharaoh (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	791	GAME( 1981, solar_l2, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Solar Fire (L-2)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	792	GAME( 1984, strlt_l1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Star Light (L-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	793	GAME( 1982, tmfnt_l5, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Time Fantasy (L-5)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	794	GAME( 1982, wrlok_l3, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Warlok (L-3)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)
	795	GAME( 1982, thund_p1, 0, s7, s7, driver_device, 0, ROT0, "Williams", "Thunderball (P-1)", GAME_MECHANICAL \| GAME_NOT_WORKING \| GAME_NO_SOUND)

trunk/src/mame/drivers/s9.c
r18808	r18809
33	33	m_audiocpu(*this, "audiocpu"),
34	34	m_dac(*this, "dac"),
35	35	m_hc55516(*this, "hc55516"),
36		m_pia(*this, "pia"),
	36	m_pias(*this, "pias"),
37	37	m_pia21(*this, "pia21"),
38	38	m_pia24(*this, "pia24"),
39	39	m_pia28(*this, "pia28"),
r18808	r18809
52	52	DECLARE_READ8_MEMBER(dips_r);
53	53	DECLARE_READ8_MEMBER(switch_r);
54	54	DECLARE_WRITE8_MEMBER(switch_w);
55		DECLARE_READ_LINE_MEMBER(pia_ca1_r);
	55	DECLARE_READ_LINE_MEMBER(pias_ca1_r);
56	56	DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
57	57	DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
58	58	DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
59		DECLARE_WRITE_LINE_MEMBER(pia_ca2_w);
60		DECLARE_WRITE_LINE_MEMBER(pia_cb2_w);
	59	DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
	60	DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
61	61	DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
62	62	DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
63	63	DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; // dummy to stop error log filling up
r18808	r18809
71	71
72	72	// devices
73	73	required_device<cpu_device> m_maincpu;
74		optional_device<cpu_device> m_audiocpu;
75		optional_device<dac_device> m_dac;
76		optional_device<hc55516_device> m_hc55516;
77		optional_device<pia6821_device> m_pia;
	74	required_device<cpu_device> m_audiocpu;
	75	required_device<dac_device> m_dac;
	76	required_device<hc55516_device> m_hc55516;
	77	required_device<pia6821_device> m_pias;
78	78	required_device<pia6821_device> m_pia21;
79	79	required_device<pia6821_device> m_pia24;
80	80	required_device<pia6821_device> m_pia28;
r18808	r18809
101	101
102	102	static ADDRESS_MAP_START( s9_audio_map, AS_PROGRAM, 8, s9_state )
103	103	AM_RANGE(0x0000, 0x07ff) AM_RAM
104		AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE("pia", pia6821_device, read, write)
	104	AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE("pias", pia6821_device, read, write)
105	105	AM_RANGE(0x8000, 0xffff) AM_ROM
106	106	ADDRESS_MAP_END
107	107
r18808	r18809
185	185	MACHINE_RESET_MEMBER( s9_state, s9 )
186	186	{
187	187	m_t_c = 0;
188		// reset the IRQ state
189		m_pia->ca1_w(1);
190	188	}
191	189
192	190	INPUT_CHANGED_MEMBER( s9_state::main_nmi )
r18808	r18809
224	222	{
225	223	// sound ns
226	224	m_ca1 = state;
227		m_pia->ca1_w(m_ca1);
	225	m_pias->ca1_w(m_ca1);
228	226	}
229	227
230	228	static const pia6821_interface pia21_intf =
r18808	r18809
338	336	DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */
339	337	};
340	338
341		READ_LINE_MEMBER( s9_state::pia_ca1_r )
	339	READ_LINE_MEMBER( s9_state::pias_ca1_r )
342	340	{
343	341	return m_ca1;
344	342	}
345	343
346		WRITE_LINE_MEMBER( s9_state::pia_ca2_w )
	344	WRITE_LINE_MEMBER( s9_state::pias_ca2_w )
347	345	{
348	346	// speech clock
349	347	hc55516_clock_w(m_hc55516, state);
350	348	}
351	349
352		WRITE_LINE_MEMBER( s9_state::pia_cb2_w )
	350	WRITE_LINE_MEMBER( s9_state::pias_cb2_w )
353	351	{
354	352	// speech data
355	353	hc55516_digit_w(m_hc55516, state);
r18808	r18809
365	363	m_dac->write_unsigned8(data);
366	364	}
367	365
368		static const pia6821_interface pia_intf =
	366	static const pia6821_interface pias_intf =
369	367	{
370	368	DEVCB_DRIVER_MEMBER(s9_state, dac_r), /* port A in */
371	369	DEVCB_NULL, /* port B in */
372		DEVCB_DRIVER_LINE_MEMBER(s9_state, pia_ca1_r), /* line CA1 in */
	370	DEVCB_DRIVER_LINE_MEMBER(s9_state, pias_ca1_r), /* line CA1 in */
373	371	DEVCB_LINE_GND, /* line CB1 in */
374	372	DEVCB_NULL, /* line CA2 in */
375	373	DEVCB_NULL, /* line CB2 in */
376	374	DEVCB_DRIVER_MEMBER(s9_state, sound_w), /* port A out */
377	375	DEVCB_DRIVER_MEMBER(s9_state, dac_w), /* port B out */
378		DEVCB_DRIVER_LINE_MEMBER(s9_state, pia_ca2_w), /* line CA2 out */
379		DEVCB_DRIVER_LINE_MEMBER(s9_state, pia_cb2_w), /* line CB2 out */
	376	DEVCB_DRIVER_LINE_MEMBER(s9_state, pias_ca2_w), /* line CA2 out */
	377	DEVCB_DRIVER_LINE_MEMBER(s9_state, pias_cb2_w), /* line CB2 out */
380	378	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */
381	379	DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */
382	380	};
r18808	r18809
417	415	MCFG_SPEAKER_STANDARD_MONO("speech")
418	416	MCFG_SOUND_ADD("hc55516", HC55516, 0)
419	417	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
420		MCFG_PIA6821_ADD("pia", pia_intf)
	418	MCFG_PIA6821_ADD("pias", pias_intf)
421	419	MACHINE_CONFIG_END
422	420
423	421	/*-----------------------------

199869 Revisions