From 0c1901e9023ca1f4a17c0ad73b35bdf897982469 Mon Sep 17 00:00:00 2001
From: Angelo Salese <angelosa@users.noreply.github.com>
Date: Sun, 13 Apr 2014 19:35:18 +0000
Subject: [PATCH] Disabled check irq routine for now.

---
 src/mame/drivers/model2.c  | 24 +++++++++++++++++++++++-
 src/mame/includes/model2.h |  1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index c9ef2d6950b..827916d9d1f 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -361,6 +361,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2_timer_cb)
 	m_timers[tnum]->reset();
 
 	m_intreq |= (1<<bit);
+	if(m_intena & 1<<bit)
+		m_maincpu->set_input_line(I960_IRQ2, ASSERT_LINE);
 	//printf("%08x %08x (%08x)\n",m_intreq,m_intena,1<<bit);
 	model2_check_irq_state();
 
@@ -1027,6 +1029,9 @@ READ32_MEMBER(model2_state::model2_irq_r)
 
 void model2_state::model2_check_irq_state()
 {
+	return;
+
+	/* TODO: vf2 and fvipers hangs with an irq halt on POST, disabled for now */
 	const int irq_type[12]= {I960_IRQ0,I960_IRQ1,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ2,I960_IRQ3,I960_IRQ3};
 
 	for(int i=0;i<12;i++)
@@ -1420,6 +1425,12 @@ WRITE32_MEMBER(model2_state::model2_3d_zclip_w)
 	model2_3d_set_zclip( machine(), data & 0xFF );
 }
 
+READ32_MEMBER(model2_state::tgpid_r)
+{
+	popmessage("Read from TGP ID, contact MAMEdev");
+	return 0;
+}
+
 /* common map for all Model 2 versions */
 static ADDRESS_MAP_START( model2_base_mem, AS_PROGRAM, 32, model2_state )
 	AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_WRITENOP
@@ -1438,6 +1449,7 @@ static ADDRESS_MAP_START( model2_base_mem, AS_PROGRAM, 32, model2_state )
 
 	AM_RANGE(0x00980004, 0x00980007) AM_READ(fifoctl_r)
 	AM_RANGE(0x0098000c, 0x0098000f) AM_READWRITE(videoctl_r,videoctl_w)
+	AM_RANGE(0x00980030, 0x0098005f) AM_READ(tgpid_r)
 
 	AM_RANGE(0x00e80000, 0x00e80007) AM_READWRITE(model2_irq_r, model2_irq_w)
 
@@ -2009,12 +2021,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2_interrupt)
 	if(scanline == 384)
 	{
 		m_intreq |= (1<<0);
+		if(m_intena & 1<<0)
+			m_maincpu->set_input_line(I960_IRQ0, ASSERT_LINE);
 		model2_check_irq_state();
 	}
 	else if(scanline == 0)
 	{
 		/* From sound to main CPU (TODO: what enables this?) */
 		m_intreq |= (1<<10);
+		if(m_intena & 1<<10)
+			m_maincpu->set_input_line(I960_IRQ3, ASSERT_LINE);
 		model2_check_irq_state();
 	}
 }
@@ -2026,17 +2042,23 @@ TIMER_DEVICE_CALLBACK_MEMBER(model2_state::model2c_interrupt)
 	if(scanline == 384)
 	{
 		m_intreq |= (1<<0);
+		if(m_intena & 1<<0)
+			m_maincpu->set_input_line(I960_IRQ0, ASSERT_LINE);
 		model2_check_irq_state();
 	}
 	else if(scanline == 0) // 384
 	{
 		m_intreq |= (1<<10);
+		if(m_intena & 1<<10)
+			m_maincpu->set_input_line(I960_IRQ3, ASSERT_LINE);
 		model2_check_irq_state();
 	}
 	else if(scanline == 256)
 	{
-		/* TODO: irq source? Source allocation in dynamcopc? */
+		/* TODO: irq source? Scroll allocation in dynamcopc? */
 		m_intreq |= (1<<2);
+		if(m_intena & 1<<2)
+			m_maincpu->set_input_line(I960_IRQ2, ASSERT_LINE);
 		model2_check_irq_state();
 	}
 
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 009b2b0f69e..9882fda6a75 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -167,6 +167,7 @@ public:
 	DECLARE_WRITE32_MEMBER(copro_sharc_buffer_w);
 	DECLARE_READ32_MEMBER(copro_tgp_buffer_r);
 	DECLARE_WRITE32_MEMBER(copro_tgp_buffer_w);
+	DECLARE_READ32_MEMBER(tgpid_r);
 	DECLARE_READ8_MEMBER(driveio_port_r);
 	DECLARE_WRITE8_MEMBER(driveio_port_w);
 	DECLARE_READ8_MEMBER(driveio_port_str_r);