Tek4404 wip

src/devices/machine/ncr5385.cpp

@@ -13,6 +13,38 @@
  *  - disconnect/reselection
  */
 
+
+// REQUIRED delay for tek4404 to write successfully
+
+// Tek4404 expects to be able to call 2 functions that clear any pending state and setup an
+// internal flag *BEFORE* the IRQ generated by XFI_OUT_ACK is received.  Without this delay the IRQ arrives
+// before the setup has been executed and IRQ handler fails to process the interrupt. => HANGS
+// A correctly functioning call sequence looks like this:
+
+// SCSI_wait
+// scsi_update_pending_flags
+// IRQ3_handler_scsi
+// scsi_read_ncr5385_status
+
+// A broken call sequence looks like this (note the setup functions are run too late)
+
+// IRQ3_handler_scsi
+// scsi_read_ncr5385_status
+// SCSI_wait
+// scsi_update_pending_flags
+
+// scsi write code is ~90 cycles / loop
+
+// then ~240 cycles before setting SR |= 0700
+
+// IRQ6 occasionally arrives between end of scsi write code and getting IRQ3.  unclear why it isn't masked out.
+
+// 40us
+unsigned constexpr TEK4404_XFI_OUT_ACK_DELAY = 10'000;
+
+// define USE_TEK4404_CHANGES  to work on tek4404 driver
+
+
 #include "emu.h"
 #include "ncr5385.h"
 
@@ -162,25 +194,35 @@ void ncr5385_device::device_reset()
 	update_int();
 }
 
+attotime ncr5385_device::scsi_data_byte_period()
+{
+#ifdef USE_TEK4404_CHANGES
+	return attotime::from_nsec(200);
+#else
+	return attotime::zero;
+#endif
+}
+
 void ncr5385_device::scsi_ctrl_changed()
 {
 	u32 const ctrl = scsi_bus->ctrl_r();
 
 	static char const *const nscsi_phase[] = { "DATA OUT", "DATA IN", "COMMAND", "STATUS", "*", "*", "MESSAGE OUT", "MESSAGE IN" };
 
-	if ((ctrl & S_BSY) && !(ctrl & S_SEL))
+	if (ctrl & S_BSY)
 	{
-		LOGMASKED(LOG_STATE, "scsi_ctrl_changed 0x%03x phase %s%s%s\n", ctrl, nscsi_phase[ctrl & S_PHASE_MASK],
-			ctrl & S_REQ ? " REQ" : "", ctrl & S_ACK ? " ACK" : "");
+		if (ctrl & S_SEL)
+			LOGMASKED(LOG_STATE, "%10s: scsi_ctrl_changed 0x%03x arbitration/selection\n", machine().time().as_string(8), ctrl);
+		else
+			LOGMASKED(LOG_STATE, "%10s: scsi_ctrl_changed 0x%03x phase %s%s%s\n", machine().time().as_string(8), ctrl, nscsi_phase[ctrl & S_PHASE_MASK],
+				ctrl & S_REQ ? " REQ" : "", ctrl & S_ACK ? " ACK" : "");
 
 		if (m_state != IDLE)
-			m_state_timer->adjust(attotime::zero);
+			m_state_timer->adjust(attotime::from_usec(80));
 	}
-	else if (ctrl & S_BSY)
-		LOGMASKED(LOG_STATE, "scsi_ctrl_changed 0x%03x arbitration/selection\n", ctrl);
 	else
 	{
-		LOGMASKED(LOG_STATE, "scsi_ctrl_changed 0x%03x BUS FREE\n", ctrl);
+		LOGMASKED(LOG_STATE, "%10s: scsi_ctrl_changed 0x%03x BUS FREE\n", machine().time().as_string(8), ctrl);
 
 		if (m_mode == INITIATOR)
 		{
@@ -253,7 +295,7 @@ u8 ncr5385_device::aux_status_r()
 		if (ctrl & S_INP)
 			data |= AUX_STATUS_IO;
 	}
-	LOGMASKED(LOG_REGR, "aux_status_r 0x%02x (%s)\n", data, machine().describe_context());
+	LOGMASKED(LOG_REGR, "%10s: aux_status_r 0x%02x (%s)\n", machine().time().as_string(8), data, machine().describe_context());
 
 	return data;
 }
@@ -266,7 +308,7 @@ u8 ncr5385_device::own_id_r()
 u8 ncr5385_device::int_status_r()
 {
 	u8 const data = m_int_status;
-	LOGMASKED(LOG_REGR, "int_status_r 0x%02x (%s)\n", data, machine().describe_context());
+	LOGMASKED(LOG_REGR, "%10s: int_status_r 0x%02x (%s)\n", machine().time().as_string(8), data, machine().describe_context());
 	m_aux_status &= ~AUX_STATUS_PARITY_ERR;
 	m_int_status = 0;
 	update_int();
@@ -315,7 +357,7 @@ void ncr5385_device::dat_w(u8 data)
 
 void ncr5385_device::cmd_w(u8 data)
 {
-	LOGMASKED(LOG_REGW, "cmd_w 0x%02x (%s)\n", data, machine().describe_context());
+	LOGMASKED(LOG_REGW, "%10s: cmd_w 0x%02x (%s)\n", machine().time().as_string(8), data, machine().describe_context());
 	if (!(data & 0x18))
 	{
 		// immediate commands
@@ -449,6 +491,8 @@ template <unsigned N> void ncr5385_device::cnt_w(u8 data)
 		m_aux_status &= ~AUX_STATUS_TC_ZERO;
 	else
 		m_aux_status |= AUX_STATUS_TC_ZERO;
+
+ 	LOGMASKED(LOG_REGW, "%10s: cnt_w %d (%d) \n", machine().time().as_string(8), m_cnt, N);
 }
 
 void ncr5385_device::tst_w(u8 data)
@@ -556,7 +600,7 @@ int ncr5385_device::state_step()
 		break;
 
 	case SEL_START:
-		LOGMASKED(LOG_STATE, "selection: SEL asserted\n");
+		LOGMASKED(LOG_STATE, "%10s: selection: SEL asserted\n", machine().time().as_string(8));
 		m_state = SEL_DELAY;
 		delay = SCSI_BUS_SKEW * 2;
 
@@ -578,7 +622,7 @@ int ncr5385_device::state_step()
 	case SEL_WAIT_BSY:
 		if (ctrl & S_BSY)
 		{
-			LOGMASKED(LOG_STATE, "selection: BSY asserted by target\n");
+			LOGMASKED(LOG_STATE, "%10s: selection: BSY asserted by target\n", machine().time().as_string(8));
 			m_state = SEL_COMPLETE;
 			delay = SCSI_BUS_SKEW * 2;
 		}
@@ -594,7 +638,7 @@ int ncr5385_device::state_step()
 		}
 		break;
 	case SEL_COMPLETE:
-		LOGMASKED(LOG_STATE, "selection: complete\n");
+		LOGMASKED(LOG_STATE, "%10s: selection: complete\n", machine().time().as_string(8));
 		m_int_status |= INT_FUNC_COMPLETE;
 		m_mode = INITIATOR;
 		m_state = SEL_WAIT_REQ;
@@ -610,7 +654,7 @@ int ncr5385_device::state_step()
 		// don't generate bus service interrupt until the function complete is cleared
 		if ((ctrl & S_REQ) && !m_int_state)
 		{
-			LOGMASKED(LOG_STATE, "selection: REQ asserted by target\n");
+			LOGMASKED(LOG_STATE, "%10s: selection: REQ asserted by target\n", machine().time().as_string(8));
 			m_int_status |= INT_BUS_SERVICE;
 			m_state = IDLE;
 
@@ -647,7 +691,7 @@ int ncr5385_device::state_step()
 			}
 			else
 			{
-				LOGMASKED(LOG_STATE, "xfi_in: %s\n", remaining() ? "phase change" : "transfer complete");
+				//LOGMASKED(LOG_STATE, "xfi_in: %s\n", remaining() ? "phase change" : "transfer complete");
 
 				m_int_status |= INT_BUS_SERVICE;
 				m_state = IDLE;
@@ -661,7 +705,7 @@ int ncr5385_device::state_step()
 	case XFI_IN_DRQ:
 		m_state = XFI_IN_ACK;
 
-		LOGMASKED(LOG_STATE, "xfi_in: data 0x%02x\n", m_dat);
+		//LOGMASKED(LOG_STATE, "%10s: xfi_in: data 0x%02x\n", machine().time().as_string(8), m_dat);
 
 		// assert ACK
 		scsi_bus->ctrl_w(scsi_refid, S_ACK, S_ACK);
@@ -675,7 +719,7 @@ int ncr5385_device::state_step()
 			{
 				m_cnt--;
 
-				LOGMASKED(LOG_STATE, "xfi_in: %d remaining\n", m_cnt);
+				//LOGMASKED(LOG_STATE, "%10s: xfi_in: %d remaining\n", machine().time().as_string(8), m_cnt);
 
 				if (!m_cnt)
 					m_aux_status |= AUX_STATUS_TC_ZERO;
@@ -686,6 +730,8 @@ int ncr5385_device::state_step()
 			// clear ACK except after last byte of message input phase
 			if (!remaining() && (ctrl & S_PHASE_MASK) == S_PHASE_MSG_IN)
 			{
+				//LOGMASKED(LOG_STATE, "xfi_in: INT_FUNC_COMPLETE\n" );
+
 				m_int_status |= INT_FUNC_COMPLETE;
 				m_state = IDLE;
 
@@ -715,7 +761,8 @@ int ncr5385_device::state_step()
 			}
 			else
 			{
-				LOGMASKED(LOG_STATE, "xfi_out: %s\n", remaining() ? "phase change" : "transfer complete");
+				LOGMASKED(LOG_STATE, "%10s: xfi_out: %s\n", machine().time().as_string(8), remaining() ? "phase change" : "transfer complete");
+
 				m_int_status |= INT_BUS_SERVICE;
 				m_state = IDLE;
 
@@ -725,11 +772,12 @@ int ncr5385_device::state_step()
 		else
 			delay = -1;
 		break;
+
 	case XFI_OUT_DRQ:
 		m_state = XFI_OUT_ACK;
 		m_aux_status &= ~AUX_STATUS_DATA_FULL;
 
-		LOGMASKED(LOG_STATE, "xfi_out: data 0x%02x\n", m_dat);
+		LOGMASKED(LOG_STATE, "%10s: xfi_out: data 0x%02x\n", machine().time().as_string(8), m_dat);
 
 		// assert data and ACK
 		scsi_bus->data_w(scsi_refid, m_dat);
@@ -750,7 +798,7 @@ int ncr5385_device::state_step()
 			{
 				m_cnt--;
 
-				LOGMASKED(LOG_STATE, "xfi_out: %d remaining\n", m_cnt);
+				LOGMASKED(LOG_STATE, "%10s: xfi_out: %d remaining\n", machine().time().as_string(8), m_cnt);
 
 				if (!m_cnt)
 					m_aux_status |= AUX_STATUS_TC_ZERO;
@@ -761,6 +809,36 @@ int ncr5385_device::state_step()
 			// clear data and ACK
 			scsi_bus->data_w(scsi_refid, 0);
 			scsi_bus->ctrl_w(scsi_refid, 0, S_ACK);
+
+			if (m_cnt == 0)
+			{
+#ifdef USE_TEK4404_CHANGES
+				// REQUIRED delay for tek4404 to write successfully
+
+				// Tek4404 expects to be able to call 2 functions that clear any pending state and setup an
+				// internal flag *BEFORE* the IRQ generated here is received.  Without this delay the IRQ arrives
+				// before the setup has been executed and IRQ handler fails to process the interrupt.
+				// A correctly functioning call sequence looks like this:
+
+				// set_flags_handling_clear_pending
+				// scsi_update_pending_flags
+				// IRQ3_handler_scsi
+				// scsi_read_ncr5385_status
+
+				// A broken call sequence looks like this (note the setup functions are run too late)
+
+				// IRQ3_handler_scsi
+				// scsi_read_ncr5385_status
+				// set_flags_handling_clear_pending
+				// scsi_update_pending_flags
+
+				// scsi write code is ~90 cycles / loop
+
+				delay = TEK4404_XFI_OUT_ACK_DELAY;
+				LOGMASKED(LOG_STATE, "%10s: XFI_OUT_ACK delay %d\n", machine().time().as_string(8), delay);
+#endif
+			}
+
 		}
 		else
 			delay = -1;
@@ -773,7 +851,7 @@ int ncr5385_device::state_step()
 				m_state = XFI_OUT_DRQ;
 			else
 			{
-				LOGMASKED(LOG_STATE, "xfi_out: %s\n", remaining() ? "phase change" : "transfer complete");
+				LOGMASKED(LOG_STATE, "%10s: xfi_out: %s\n", machine().time().as_string(8), remaining() ? "phase change" : "transfer complete");
 				m_int_status |= INT_BUS_SERVICE;
 				m_state = IDLE;
 
@@ -821,7 +899,7 @@ void ncr5385_device::update_int()
 
 	if (m_int_state != int_state)
 	{
-		LOG("update_int %d\n", int_state);
+		LOG("%10s: update_int %d\n", machine().time().as_string(8), int_state);
 
 		m_aux_status &= ~(AUX_STATUS_MSG | AUX_STATUS_CD | AUX_STATUS_IO);
 		if (int_state)

src/devices/machine/ncr5385.h

@@ -63,6 +63,7 @@ class ncr5385_device
 	virtual void device_reset() override ATTR_COLD;
 
 	// ncsci_device implementation
+	virtual attotime scsi_data_byte_period();
 	virtual void scsi_ctrl_changed() override;
 
 	// read handlers

src/devices/machine/ns32081.cpp

@@ -130,7 +130,7 @@ template <typename T> T ns32081_device_base::read()
 		return data;
 	}
 
-	logerror("read protocol error (%s)\n", machine().describe_context());
+	logerror("read protocol error state(%d) issue(%d) expected(%d) (%s)\n", m_state, m_op[2].issued, m_op[2].expected, machine().describe_context());
 	return 0;
 }
 
@@ -149,7 +149,7 @@ template <typename T> void ns32081_device_base::write(T data)
 		}
 		else
 		{
-			LOG("write idbyte 0x%04x (%s)\n", data, machine().describe_context());
+			LOG("write idbyte 0x%02x (%s)\n", data, machine().describe_context());
 			if ((data == FORMAT_9) || (data == FORMAT_11) || (type() == NS32381 && data == FORMAT_12))
 			{
 				// record idbyte
@@ -633,9 +633,9 @@ void ns32081_device_base::execute()
 		}
 
 		if (m_status & SLAVE_Q)
-			LOG("execute %s 0x%x,0x%x exception\n", operation, m_op[0].value, m_op[1].value);
+			LOG("execute %s 0x%8.8x,0x%8.8x exception\n", operation, m_op[0].value, m_op[1].value);
 		else
-			LOG("execute %s 0x%x,0x%x result 0x%x\n", operation, m_op[0].value, m_op[1].value, m_op[2].value);
+			LOG("execute %s 0x%8.8x,0x%8.8x result 0x%x\n", operation, m_op[0].value, m_op[1].value, m_op[2].value);
 	}
 
 	// write-back floating point register results

src/emu/diserial.cpp

@@ -204,8 +204,10 @@ void device_serial_interface::set_data_frame(int start_bit_count, int data_bit_c
 	{
 		m_rcv_bit_count++;
 	}
-
+#ifndef USE_TEK4404_CHANGES
 	receive_register_reset();
+#endif
+
 }
 
 void device_serial_interface::receive_register_reset()

src/mame/layout/tek4404.lay

@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+license:CC0-1.0
+authors: Elektraglide
+
+Tektronix 4404 Artificial Intelligence System.
+-->
+<mamelayout version="2">
+	<element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
+	<element name="led_round" defstate="1">
+		<disk state="1">
+			<color red="0.2" green="0.0" blue="0.0" />
+		</disk>
+		<disk state="0">
+			<color red="1.0" green="0.0" blue="0.0" />
+		</disk>
+	</element>
+	<element name="led_rect" defstate="1">
+		<rect state="1">
+			<color red="0.2" green="0.0" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="1.0" green="0.1" blue="0.1" />
+		</rect>
+	</element>
+	<view name="Graphics">
+		<bounds x="0" y="0" width="640" height="496" />
+
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<element name="spacer" ref="static_black">
+			<bounds x="0" y="480" width="640" height="16" />
+		</element>
+
+		<element name="led_1" ref="led_round">
+			<bounds x="46" y="484" width="8" height="8" />
+		</element>
+		<element name="led_2" ref="led_round">
+			<bounds x="34" y="484" width="8" height="8" />
+		</element>
+		<element name="led_4" ref="led_round">
+			<bounds x="22" y="484" width="8" height="8" />
+		</element>
+		<element name="led_8" ref="led_round">
+			<bounds x="10" y="484" width="8" height="8" />
+		</element>
+		<element name="led_disk" ref="led_rect">
+			<bounds x="614" y="485" width="16" height="6" />
+		</element>
+	</view>
+</mamelayout>