浏览代码

Improved async noise model that considers all 9 dbx signals.

Michael McMaster 6 年之前
父节点
当前提交
662e005e84
共有 4 个文件被更改,包括 6 次插入4 次删除
  1. 1 0
      lib/SCSI2SD/CHANGELOG
  2. 二进制
      lib/SCSI2SD/rtl/fpga_bitmap.o
  3. 2 2
      lib/SCSI2SD/src/firmware/config.c
  4. 3 2
      lib/SCSI2SD/src/firmware/scsiPhy.c

+ 1 - 0
lib/SCSI2SD/CHANGELOG

@@ -1,6 +1,7 @@
 2019XXXX
 	- Port XEBEC support from v5 firmware
 	- Add Flexible Disk Drive Geometry SCSI MODE page
+	- Stability improvements
 
 20181011		6.2.1
 	- Fix bug in USB disk interface with disks over 4GB

二进制
lib/SCSI2SD/rtl/fpga_bitmap.o


+ 2 - 2
lib/SCSI2SD/src/firmware/config.c

@@ -37,7 +37,7 @@
 
 #include <string.h>
 
-static const uint16_t FIRMWARE_VERSION = 0x0621;
+static const uint16_t FIRMWARE_VERSION = 0x0623;
 
 // 1 flash row
 static const uint8_t DEFAULT_CONFIG[128] =
@@ -219,7 +219,7 @@ debugCommand()
 	response[27] = scsiDev.lastSenseASC >> 8;
 	response[28] = scsiDev.lastSenseASC;
 	response[29] = *SCSI_STS_DBX & 0xff; // What we've read
-	response[30] = 0; // obsolete
+	response[30] = *SCSI_STS_SELECTED;
 	response[31] = *SCSI_STS_DBX >> 8; // What we're writing
 	hidPacket_send(response, sizeof(response));
 }

+ 3 - 2
lib/SCSI2SD/src/firmware/scsiPhy.c

@@ -30,8 +30,8 @@
 static uint8_t asyncTimings[][4] =
 {
 /* Speed,    Assert,    Deskew,    Hold,    Glitch */
-{/*1.5MB/s*/ 28,        18,        13,      15},
-{/*3.3MB/s*/ 13,        6,         6,       13},
+{/*1.5MB/s*/ 28,        18,        13,      6},
+{/*3.3MB/s*/ 13,        6,         6,       6},
 {/*5MB/s*/   9,         6,         6,       6}, // 80ns
 {/*safe*/    3,         6,         6,       6}, // Probably safe
 {/*turbo*/   3,         3,         3,       2}
@@ -576,6 +576,7 @@ void scsiEnterPhase(int newPhase)
 
 			if (scsiDev.compatMode < COMPAT_SCSI2)
 			{
+				// EMU EMAX needs 100uS ! 10uS is not enough.
 				s2s_delay_us(100);
 			}
 		}