From 0dc678e604124e37b695a505621c8462d62d9414 Mon Sep 17 00:00:00 2001 From: Ruige Lee Date: Fri, 8 Aug 2025 11:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E9=94=99=E8=AF=AF=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E5=8F=91=E7=94=9F=E6=97=B6=E6=B8=850=E6=89=8D?= =?UTF-8?q?=E4=BC=9A=E8=A7=A6=E5=8F=91=E9=83=A8=E5=88=86=E5=A4=8D=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/scala/backBoard/shin/ShinTop.scala | 12 ++++++------ src/main/scala/backBoard/shin/SlaveParser.scala | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/scala/backBoard/shin/ShinTop.scala b/src/main/scala/backBoard/shin/ShinTop.scala index 86a5466..e44a44c 100644 --- a/src/main/scala/backBoard/shin/ShinTop.scala +++ b/src/main/scala/backBoard/shin/ShinTop.scala @@ -352,12 +352,12 @@ trait ShinTopSlave{ this: ShinTopBase => } - slaveParser.io.intHWClr(0) := interface.io.intHWClr(0) - slaveParser.io.intHWClr(1) := interface.io.intHWClr(1) - downCDRIn.reset := reset.asBool | interface.io.intHWClr(0) - upCDRIn.reset := reset.asBool | interface.io.intHWClr(1) - downCDROut.reset := reset.asBool | interface.io.intHWClr(0) - upCDROut.reset := reset.asBool | interface.io.intHWClr(1) + slaveParser.io.intHWClr(0) := interface.io.intHWTrig(0) & interface.io.intHWClr(0) + slaveParser.io.intHWClr(1) := interface.io.intHWTrig(1) & interface.io.intHWClr(1) + downCDRIn.reset := reset.asBool | ( interface.io.intHWTrig(0) & interface.io.intHWClr(0) ) + upCDRIn.reset := reset.asBool | ( interface.io.intHWTrig(1) & interface.io.intHWClr(1) ) + downCDROut.reset := reset.asBool | ( interface.io.intHWTrig(0) & interface.io.intHWClr(0) ) + upCDROut.reset := reset.asBool | ( interface.io.intHWTrig(1) & interface.io.intHWClr(1) ) interface.io.lvds <> slaveParser.io.lvds diff --git a/src/main/scala/backBoard/shin/SlaveParser.scala b/src/main/scala/backBoard/shin/SlaveParser.scala index 8b2081b..9ad77df 100644 --- a/src/main/scala/backBoard/shin/SlaveParser.scala +++ b/src/main/scala/backBoard/shin/SlaveParser.scala @@ -991,11 +991,11 @@ with SlaveParserProbe{ io.intHWTrig(0) := downRecParser.io.isError io.intHWTrig(1) := upRecParser.io.isError - downRecParser.reset := reset.asBool | io.intHWClr(0) - downSendGen.reset := reset.asBool | io.intHWClr(0) + downRecParser.reset := reset.asBool | (downRecParser.io.isError & io.intHWClr(0)) + downSendGen.reset := reset.asBool | (downRecParser.io.isError & io.intHWClr(0)) - upRecParser.reset := reset.asBool | io.intHWClr(1) - upSendGen.reset := reset.asBool | io.intHWClr(1) + upRecParser.reset := reset.asBool | (upRecParser.io.isError & io.intHWClr(1)) + upSendGen.reset := reset.asBool | (upRecParser.io.isError & io.intHWClr(1)) io.downRecStat := downRecParser.io.stat io.upRecStat := upRecParser.io.stat