summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s8.c
diff options
context:
space:
mode:
author Robbbert <robbbert@users.noreply.github.com>2014-10-04 12:03:22 +0000
committer Robbbert <robbbert@users.noreply.github.com>2014-10-04 12:03:22 +0000
commitec2b170c8dc6b8b90bd0b98ea8e2c77300a092a7 (patch)
tree285f6b3387e607ff6e3ac895691e3eb94ff334af /src/mame/drivers/s8.c
parent5268f3195ea9ade30fdabc0e899d6815b8ce6a7f (diff)
s8,s8a : fixed diagnostic mode.
Diffstat (limited to 'src/mame/drivers/s8.c')
-rw-r--r--src/mame/drivers/s8.c99
1 files changed, 60 insertions, 39 deletions
diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c
index 57664f6f6f5..fe9976b53f6 100644
--- a/src/mame/drivers/s8.c
+++ b/src/mame/drivers/s8.c
@@ -40,7 +40,6 @@ Break Street, another failed novelty, not much is known about it. Seems it
features a break-dancing toy and a spinning disk.
ToDo:
-- Diagnostic buttons not working
************************************************************************************/
@@ -80,23 +79,24 @@ public:
DECLARE_READ8_MEMBER(switch_r);
DECLARE_WRITE8_MEMBER(switch_w);
DECLARE_READ_LINE_MEMBER(pia21_ca1_r);
- DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
- DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids
DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; // dummy to stop error log filling up
DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4
DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2
- TIMER_DEVICE_CALLBACK_MEMBER(irq);
+ DECLARE_WRITE_LINE_MEMBER(pia_irq);
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s8);
+ DECLARE_DRIVER_INIT(s8);
private:
- UINT8 m_t_c;
UINT8 m_sound_data;
UINT8 m_strobe;
UINT8 m_kbdrow;
bool m_data_ok;
+ emu_timer* m_irq_timer;
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
+ static const device_timer_id TIMER_IRQ = 0;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<dac_device> m_dac;
@@ -177,11 +177,6 @@ static INPUT_PORTS_START( s8 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Up/Down") PORT_CODE(KEYCODE_6_PAD) PORT_TOGGLE
INPUT_PORTS_END
-MACHINE_RESET_MEMBER( s8_state, s8 )
-{
- m_t_c = 0;
-}
-
INPUT_CHANGED_MEMBER( s8_state::main_nmi )
{
// Diagnostic button sends a pulse to NMI pin
@@ -221,17 +216,6 @@ WRITE_LINE_MEMBER( s8_state::pia21_ca2_w )
WRITE8_MEMBER( s8_state::lamp0_w )
{
- m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE);
-}
-
-READ_LINE_MEMBER( s8_state::pia28_ca1_r )
-{
- return BIT(ioport("DIAGS")->read(), 2); // advance button
-}
-
-READ_LINE_MEMBER( s8_state::pia28_cb1_r )
-{
- return BIT(ioport("DIAGS")->read(), 3); // up/down switch
}
WRITE8_MEMBER( s8_state::dig0_w )
@@ -271,19 +255,58 @@ READ8_MEMBER( s8_state::dac_r )
return m_sound_data;
}
-TIMER_DEVICE_CALLBACK_MEMBER( s8_state::irq )
+WRITE_LINE_MEMBER( s8_state::pia_irq )
{
- if (m_t_c > 0x70)
- m_maincpu->set_input_line(M6800_IRQ_LINE, ASSERT_LINE);
+ if(state == CLEAR_LINE)
+ {
+ // restart IRQ timer
+ m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
+ }
else
- m_t_c++;
+ {
+ // disable IRQ timer while other IRQs are being handled
+ // (counter is reset every 32 cycles while a PIA IRQ is handled)
+ m_irq_timer->adjust(attotime::zero);
+ }
+}
+
+void s8_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+ switch(id)
+ {
+ case TIMER_IRQ:
+ if(param == 1)
+ {
+ m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_irq_timer->adjust(attotime::from_ticks(32,1e6),0);
+ m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
+ m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
+ }
+ else
+ {
+ m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
+ m_pia28->ca1_w(1);
+ m_pia28->cb1_w(1);
+ }
+ break;
+ }
+}
+
+MACHINE_RESET_MEMBER( s8_state, s8 )
+{
+}
+
+DRIVER_INIT_MEMBER( s8_state, s8 )
+{
+ m_irq_timer = timer_alloc(TIMER_IRQ);
+ m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
}
static MACHINE_CONFIG_START( s8, s8_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s8_main_map)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s8_state, irq, attotime::from_hz(250))
MCFG_MACHINE_RESET_OVERRIDE(s8_state, s8)
/* Video */
@@ -300,33 +323,31 @@ static MACHINE_CONFIG_START( s8, s8_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, sol2_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia21_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, lamp0_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, lamp1_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READCA1_HANDLER(READLINE(s8_state, pia28_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(s8_state, pia28_cb1_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, dig0_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, dig1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia28_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s8_state, switch_r))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, switch_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
- MCFG_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz)
@@ -364,5 +385,5 @@ ROM_START(pfevr_p3)
ROM_END
-GAME(1984,pfevr_l2, 0, s8, s8, driver_device, 0, ROT0, "Williams", "Pennant Fever (L-2)", GAME_MECHANICAL)
-GAME(1984,pfevr_p3, pfevr_l2, s8, s8, driver_device, 0, ROT0, "Williams", "Pennant Fever (P-3)", GAME_MECHANICAL)
+GAME(1984,pfevr_l2, 0, s8, s8, s8_state, s8, ROT0, "Williams", "Pennant Fever (L-2)", GAME_MECHANICAL)
+GAME(1984,pfevr_p3, pfevr_l2, s8, s8, s8_state, s8, ROT0, "Williams", "Pennant Fever (P-3)", GAME_MECHANICAL)