From 60eec33b2dd56e14bf900dbf1adaaf5914bf30fa Mon Sep 17 00:00:00 2001
From: Ruige Lee <wut.ruigeli@gmail.com>
Date: Fri, 29 Aug 2025 15:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E8=A1=8C=E4=BA=A4=E6=8D=A2?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/scala/backBoard/shin/Interface.scala |  4 +-
 .../scala/backBoard/shin/MstSlvSwitch.scala   | 93 +++++++++++++------
 2 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/src/main/scala/backBoard/shin/Interface.scala b/src/main/scala/backBoard/shin/Interface.scala
index 2d425b8..e6c7a88 100644
--- a/src/main/scala/backBoard/shin/Interface.scala
+++ b/src/main/scala/backBoard/shin/Interface.scala
@@ -309,8 +309,8 @@ abstract class InterfaceBase extends Module with RequireAsyncReset{
       }) ++
 
       Seq(
-        (addr === "h4a".U ) -> cReg.dwupEx.extrace(0),
-        (addr === "h4c".U ) -> cReg.b8b4Sel.extrace(0),
+        (addr === "h4a".U ) -> cReg.dwupEx.extract(0),
+        (addr === "h4c".U ) -> cReg.b8b4Sel.extract(0),
         (addr === "h4e".U ) -> cReg.cdrParam(7,0),
 
         (addr === "h50".U ) -> cReg.anamuxSel,
diff --git a/src/main/scala/backBoard/shin/MstSlvSwitch.scala b/src/main/scala/backBoard/shin/MstSlvSwitch.scala
index a3286b0..8ade497 100644
--- a/src/main/scala/backBoard/shin/MstSlvSwitch.scala
+++ b/src/main/scala/backBoard/shin/MstSlvSwitch.scala
@@ -472,41 +472,78 @@ class MstSlvSwitch extends MstSlvSwitchBase
 with MstSlvSwitchMaster
 with MstSlvSwitchSlave
 with MstSlvSwitchWatchDog{
-  val isDwUpEx = interface.cReg.dwupEx
+  val isDwUpEx = interface.io.cReg.dwupEx(15,8) === "h58".U && interface.io.cReg.dwupEx.extract(0)
 
 
-  when( interface.io.cReg.modeSel === false.B ){ //slave
-    when( (slaveParser.io.intHWTrig(0) | slaveParser.io.intHWTrig(1)) | interface.io.isPoReset ){ //硬件错误
+  when( ~isDwUpEx ){ //未交叉
+    when( interface.io.cReg.modeSel === false.B ){ //slave
+      when( (slaveParser.io.intHWTrig(0) | slaveParser.io.intHWTrig(1)) | interface.io.isPoReset ){ //硬件错误
+        io.downCDRIn.serDat  := false.B
+        io.upCDRIn.serDat  := false.B
+        when( slaveParser.io.isLoop ){ //回环
+          io.dDatOut := false.B
+          io.uDatOut := io.dDatIn
+        } .otherwise{ //非回环
+          io.dDatOut := io.dDatIn
+          io.uDatOut := io.uDatIn      
+        }
+      } .otherwise{ //无硬件错误
+        when( slaveParser.io.isLoop ){ //回环
+          io.downCDRIn.serDat  := io.dDatIn
+          io.upCDRIn.serDat    := io.downCDROut.serDat
+          io.dDatOut := false.B
+          io.uDatOut := io.upCDROut.serDat 
+        } .otherwise{ //非回环
+          io.downCDRIn.serDat  := io.dDatIn
+          io.upCDRIn.serDat    := io.uDatIn
+          io.dDatOut := io.downCDROut.serDat
+          io.uDatOut := io.upCDROut.serDat
+        }
+      }
+    } .otherwise{ //master
       io.downCDRIn.serDat  := false.B
-      io.upCDRIn.serDat  := false.B
-      when( slaveParser.io.isLoop ){ //回环
-        io.dDatOut := false.B
-        io.uDatOut := io.dDatIn
-      } .otherwise{ //非回环
-        io.dDatOut := io.dDatIn
-        io.uDatOut := io.uDatIn      
-      }
-    } .otherwise{ //无硬件错误
-      when( slaveParser.io.isLoop ){ //回环
-        io.downCDRIn.serDat  := io.dDatIn
-        io.upCDRIn.serDat    := io.downCDROut.serDat
-        io.dDatOut := false.B
-        io.uDatOut := io.upCDROut.serDat 
-      } .otherwise{ //非回环
-        io.downCDRIn.serDat  := io.dDatIn
-        io.upCDRIn.serDat    := io.uDatIn
-        io.dDatOut := io.downCDROut.serDat
-        io.uDatOut := io.upCDROut.serDat
-      }
+      io.upCDRIn.serDat    := io.uDatIn
+      io.dDatOut := io.downCDROut.serDat
+      io.uDatOut := false.B
+    }
+  } .otherwise{ //交叉
+    when( interface.io.cReg.modeSel === false.B ){ //slave
+      when( (slaveParser.io.intHWTrig(0) | slaveParser.io.intHWTrig(1)) | interface.io.isPoReset ){ //硬件错误
+
+        when( slaveParser.io.isLoop ){ //回环
+          io.dDatOut := io.uDatIn
+          io.uDatOut := false.B
+          io.downCDRIn.serDat  := false.B
+          io.upCDRIn.serDat  := false.B
+        } .otherwise{ //非回环
+          io.dDatOut := io.dDatIn
+          io.uDatOut := io.uDatIn   
+          io.downCDRIn.serDat  := false.B
+          io.upCDRIn.serDat  := false.B   
+        }
+      } .otherwise{ //无硬件错误
+        when( slaveParser.io.isLoop ){ //回环
+          io.downCDRIn.serDat  := io.uDatIn
+          io.upCDRIn.serDat    := io.downCDROut.serDat
+          io.uDatOut := false.B
+          io.dDatOut := io.upCDROut.serDat 
+        } .otherwise{ //非回环
+          io.downCDRIn.serDat  := io.uDatIn
+          io.upCDRIn.serDat    := io.dDatIn
+          io.dDatOut := io.upCDROut.serDat
+          io.uDatOut := io.downCDROut.serDat
+        }
+      }
+    } .otherwise{ //master
+      io.downCDRIn.serDat  := false.B
+      io.upCDRIn.serDat    := io.dDatIn
+      io.uDatOut := io.downCDROut.serDat
+      io.dDatOut := false.B
     }
-  } .otherwise{ //master
-    io.downCDRIn.serDat  := false.B
-    io.upCDRIn.serDat    := io.uDatIn
-    io.dDatOut := io.downCDROut.serDat
-    io.uDatOut := false.B
   }
 
 
 
 
+
 }