Revert disk reading, offset does not work

Author: univta0001

docs/emu6502_web_bg.wasm

@@ -25,7 +25,7 @@ serde_json = "1.0.140"
 crossbeam-epoch = "0.9.18"
 ryu = "1.0.20"
 autocfg = "1.4.0"
-crossbeam-channel = "0.5.14"
+crossbeam-channel = "0.5.15"
 num_cpus = "1.16.0"
 
 [features]

emu6502_web/pkg/emu6502_web_bg.wasm

@@ -3136,7 +3136,7 @@ impl CPU {
                     }
                 }
 
-                /* TRB */
+                /* TSB */
                 0x04 | 0x0c => {
                     if self.m65c02 {
                         self.tsb(opcode);

emu6502_web/style.css

@@ -1855,7 +1855,9 @@ impl DiskDrive {
 
         // If crc32 checksum is not zero, check the crc32 value
         if crc32_check != 0 && crc32_value != crc32_check {
-            let err_message = format!("Invalid woz2 file - Checksum Failed ({crc32_value:08X}))");
+            let crc32_value_be = crc32_value.to_be();
+            let err_message =
+                format!("Invalid woz2 file - Checksum Failed ({crc32_value_be:08X}))");
             return Err(std::io::Error::new(
                 io::ErrorKind::InvalidInput,
                 err_message,
@@ -2322,8 +2324,10 @@ impl DiskDrive {
         disk.last_track = disk.track;
         let read_pulse = Self::read_flux_data(disk);
         //let optimal_timing = (disk.optimal_timing as f32 + disk_jitter) / 8.0;
+
+        let offset = 0;
         let optimal_timing = if !self.q7 {
-            disk.optimal_timing as isize * 1000 - 1
+            disk.optimal_timing as isize * 1000 + offset
         } else {
             // Writing is always at 4 microseconds
             32 * 1000
@@ -2355,7 +2359,7 @@ impl DiskDrive {
             }
 
             self.lss_cycle -= optimal_timing;
-            let delay = optimal_timing - (32 * 1000 - 1);
+            let delay = optimal_timing - (32 * 1000 + offset);
             if delay < 0 && self.pulse > 0 {
                 self.lss_cycle += delay
             }
@@ -2709,9 +2713,12 @@ impl Card for DiskDrive {
             LOC_DRIVEREADMODE => {
                 self.q7 = false;
 
-                //  Latch is cleared to make Epidemic works
-                self.latch = 0;
+                // Workaround to make Epidemic works
+                if !self.q6 {
+                    self.latch = 0;
+                }
             }
+
             LOC_DRIVEWRITEMODE => {
                 self.q7 = true;
             }

emulator/Cargo.toml

@@ -29,7 +29,7 @@ sdl2 = "0.37.0"
 
 [build-dependencies]
 embed-resource = "3.0.2"
-cc = "1.2.18"
+cc = "1.2.19"
 
 [features]
 #default = [ ]

emulator/src/cpu.rs

@@ -10,7 +10,7 @@ emu6502 = { path = "../emulator" }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 pprof = { version = "0.14.0", features = ["flamegraph","protobuf-codec"] }
-symbolic-demangle = "12.14.1"
+symbolic-demangle = "12.15.3"
 inferno = "0.12.2"
 
 [[bin]]