From 5ec897b68de4a8f3177b48108262620e7b6fc7fe Mon Sep 17 00:00:00 2001
From: Michael McMaster <michael@codesrc.com>
Date: Wed, 30 Oct 2019 20:36:49 +1000
Subject: [PATCH] Fix incorrect reporting of failures from self-test function.

---
 CHANGELOG              |  3 ++
 src/firmware/config.c  |  2 +-
 src/firmware/scsiPhy.c | 74 +-----------------------------------------
 3 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a6955fff..61da61ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+20191030		6.2.8
+	- Fix incorrect results from the self-test function.
+
 20191009		6.2.7
 	- Slight improvements to data throughput, which may assist SCSI hosts with
 	short timeouts.
diff --git a/src/firmware/config.c b/src/firmware/config.c
index f9b288c8..0e147a86 100755
--- a/src/firmware/config.c
+++ b/src/firmware/config.c
@@ -37,7 +37,7 @@
 
 #include <string.h>
 
-static const uint16_t FIRMWARE_VERSION = 0x0627;
+static const uint16_t FIRMWARE_VERSION = 0x0628;
 
 // 1 flash row
 static const uint8_t DEFAULT_CONFIG[128] =
diff --git a/src/firmware/scsiPhy.c b/src/firmware/scsiPhy.c
index 9337b13c..a3801273 100755
--- a/src/firmware/scsiPhy.c
+++ b/src/firmware/scsiPhy.c
@@ -133,17 +133,6 @@ void EXTI4_IRQHandler()
 	}
 }
 
-static void assertFail()
-{
-	while (1)
-	{
-		s2s_ledOn();
-		s2s_delay_ms(100);
-		s2s_ledOff();
-		s2s_delay_ms(100);
-	}
-}
-
 void
 scsiSetDataCount(uint32_t count)
 {
@@ -969,69 +958,8 @@ int scsiSelfTest()
 	// TODO Test DBP
 	*SCSI_CTRL_DBX = 0;
 
-	// FPGA comms test code
-	for(i = 0; i < 10000; ++i)
-	{
-		for (int j = 0; j < SCSI_FIFO_DEPTH; ++j)
-		{
-			scsiDev.data[j] = j;
-		}
-
-		if (!scsiPhyFifoEmpty())
-		{
-			assertFail();
-		}
-
-		*SCSI_CTRL_PHASE = DATA_IN;
-		HAL_DMA_Start(
-			&memToFSMC,
-			(uint32_t) &scsiDev.data[0],
-			(uint32_t) SCSI_FIFO_DATA,
-			SCSI_FIFO_DEPTH / 4);
-
-		HAL_DMA_PollForTransfer(
-			&memToFSMC,
-			HAL_DMA_FULL_TRANSFER,
-			0xffffffff);
-
-		if (!scsiPhyFifoFull())
-		{
-			assertFail();
-		}
-
-		memset(&scsiDev.data[0], 0, SCSI_FIFO_DEPTH);
-
-		*SCSI_CTRL_PHASE = DATA_OUT;
-		HAL_DMA_Start(
-			&fsmcToMem,
-			(uint32_t) SCSI_FIFO_DATA,
-			(uint32_t) &scsiDev.data[0],
-			SCSI_FIFO_DEPTH / 2);
-
-		HAL_DMA_PollForTransfer(
-			&fsmcToMem,
-			HAL_DMA_FULL_TRANSFER,
-			0xffffffff);
-
-		if (!scsiPhyFifoEmpty())
-		{
-			assertFail();
-		}
-
-
-		for (int j = 0; j < SCSI_FIFO_DEPTH; ++j)
-		{
-			if (scsiDev.data[j] != (uint8_t) j)
-			{
-				result |= 64;
-			}
-		}
-
-		s2s_fpgaReset();
-
-	}
-
 	*SCSI_CTRL_BSY = 0;
+
 	return result;
 }
 
-- 
2.38.5