Fix synchronous negotiation bug

diff --git a/Makefile b/Makefile
index 0839fcdfaf68ebd068c0445cf2e0bd298dbdc10f..350c858489a624ab3261b16fa139bbec88300511 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,7 @@ CPPFLAGS=-DSTM32F205xx -DUSE_HAL_DRIVER -Wall -Werror
 CFLAGS=-mcpu=cortex-m3 -mthumb -mslow-flash-data \
        -std=gnu11 \
        -specs=nosys.specs \
-       -g \
-
-#      -Os -g \
+       -Os -g \
 
 LDFLAGS= \
        "-Tsrc/firmware/link.ld" \

diff --git a/src/firmware/scsi.c b/src/firmware/scsi.c
index e43afd2497fe9e2ace67cfd2c771bea9b0c3efff..ff54cd2789d563cefe81a0a72a0e6f0b4d7b6cd4 100755 (executable)
--- a/src/firmware/scsi.c
+++ b/src/firmware/scsi.c
@@ -757,8 +757,8 @@ static void process_MessageOut()
                }\r
                else if (extmsg[0] == 1 && msgLen == 3) // Synchronous data request\r
                {\r
-                       int transferPeriod = extmsg[3];\r
-                       int offset = extmsg[4];\r
+                       int transferPeriod = extmsg[1];\r
+                       int offset = extmsg[2];\r
 \r
                        if (transferPeriod > 50) // 200ns, 5MB/s\r
                        {\r
@@ -766,11 +766,15 @@ static void process_MessageOut()
                                scsiDev.target->syncPeriod = 0;\r
                        } else {\r
                                scsiDev.target->syncOffset = offset < 15 ? offset : 15;\r
-                               if (transferPeriod <= 25)\r
+                               if (transferPeriod <= 12)\r
                                {\r
-                                       scsiDev.target->syncPeriod = 25; // 10MB/s\r
+                                       scsiDev.target->syncPeriod = 12; // 50ns, 20MB/s\r
+                               }\r
+                               else if (transferPeriod <= 25)\r
+                               {\r
+                                       scsiDev.target->syncPeriod = 25; // 100ns, 10MB/s\r
                                } else {\r
-                                       scsiDev.target->syncPeriod = 50; // 5MB/s\r
+                                       scsiDev.target->syncPeriod = 50; // 200ns, 5MB/s\r
                                }\r
                        }\r
 \r

diff --git a/src/firmware/scsiPhy.c b/src/firmware/scsiPhy.c
index 71640f4ff74b47e30f36df43bf735dc7b185e452..f4241573d02e477445126f63cbf7a4b6e725aba3 100755 (executable)
--- a/src/firmware/scsiPhy.c
+++ b/src/firmware/scsiPhy.c
@@ -28,16 +28,24 @@
 \r
 #include <string.h>\r
 \r
+// 5MB/s\r
 // Assumes a 60MHz fpga clock.\r
 // 7:6 Hold count, 45ns\r
 // 5:3 Assertion count, 90ns\r
 // 2:0 Deskew count, 55ns\r
 #define SCSI_DEFAULT_TIMING ((0x3 << 6) | (0x6 << 3) | 0x4)\r
 \r
-// 7:6 Hold count, 10ns\r
+// 10MB/s\r
+// 7:6 Hold count, 17ns\r
 // 5:3 Assertion count, 30ns\r
 // 2:0 Deskew count, 25ns\r
-#define SCSI_FAST_TIMING ((0x1 << 6) | (0x2 << 3) | 0x2)\r
+#define SCSI_FAST10_TIMING ((0x1 << 6) | (0x2 << 3) | 0x2)\r
+\r
+// 20MB/s\r
+// 7:6 Hold count, 17ns\r
+// 5:3 Assertion count, 17ns\r
+// 2:0 Deskew count, 17ns\r
+#define SCSI_FAST20_TIMING ((0x1 << 6) | (0x1 << 3) | 0x1)\r
 \r
 // Private DMA variables.\r
 static int dmaInProgress = 0;\r
@@ -406,10 +414,15 @@ void scsiEnterPhase(int phase)
                if ((newPhase == DATA_IN || newPhase == DATA_OUT) &&\r
                        scsiDev.target->syncOffset)\r
                {\r
-                       if (scsiDev.target->syncPeriod == 25)\r
+                       if (scsiDev.target->syncPeriod == 12)\r
+                       {\r
+                               // SCSI2 FAST-20 Timing. 20MB/s.\r
+                               *SCSI_CTRL_TIMING = SCSI_FAST20_TIMING;\r
+                       }\r
+                       else if (scsiDev.target->syncPeriod == 25)\r
                        {\r
                                // SCSI2 FAST Timing. 10MB/s.\r
-                               *SCSI_CTRL_TIMING = SCSI_FAST_TIMING;\r
+                               *SCSI_CTRL_TIMING = SCSI_FAST10_TIMING;\r
                        } else {\r
                                // 5MB/s Timing\r
                                *SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;\r