diff --git a/src/main/scala/backBoard/shin/ShinTop.scala b/src/main/scala/backBoard/shin/ShinTop.scala index 70069d8..42cf6cd 100644 --- a/src/main/scala/backBoard/shin/ShinTop.scala +++ b/src/main/scala/backBoard/shin/ShinTop.scala @@ -243,9 +243,9 @@ trait ShinTopSlave{ this: ShinTopBase => when( io.modeSel === false.B ){ slaveParser.io.downIn <> io.downIn - io.downOut <> Queue( slaveParser.io.downOut, 1, true, true) + io.downOut <> slaveParser.io.downOut slaveParser.io.upIn <> io.upIn - io.upOut <> Queue( slaveParser.io.upOut, 1, true, true) + io.upOut <> slaveParser.io.upOut } slaveParser.io.timeStamp := io.timeStamp diff --git a/src/main/scala/backBoard/shin/SlaveParser.scala b/src/main/scala/backBoard/shin/SlaveParser.scala index 8bb2742..9e65fbd 100644 --- a/src/main/scala/backBoard/shin/SlaveParser.scala +++ b/src/main/scala/backBoard/shin/SlaveParser.scala @@ -77,7 +77,7 @@ abstract class SlaveParserBase extends Module{ val upSendGen = Module(new SlaveSendGen) val isReadyToProbe = RegInit(false.B) - val isLastDevice: Bool = RegInit(false.B) + val isLastDevice: Bool = RegInit(true.B) val isDeviceModified: Bool = RegInit(true.B) val localDevIndex = RegInit(0.U(14.W)) //当前设备索引 @@ -661,11 +661,11 @@ trait SlaveParserProbe{ this: SlaveParserBase => - io.upOut <> upSendGen.io.send + io.upOut <> Queue( upSendGen.io.send, 1, true, true ) io.downIn <> downRecParser.io.rec when( isLastDevice & ~isReadyToProbe ){ //最后一个设备且不是探测模式 - downSendGen.io.send <> upRecParser.io.rec //axis短接 + upRecParser.io.rec <> Queue( downSendGen.io.send, 1, true, true ) //axis短接 io.downOut.valid := false.B //对外下级io开路 io.downOut.bits := 0.U.asTypeOf(new AXIS_Bundle(8)) @@ -673,7 +673,7 @@ trait SlaveParserProbe{ this: SlaveParserBase => } .otherwise{ - io.downOut <> downSendGen.io.send + io.downOut <> Queue( downSendGen.io.send, 1, true, true ) io.upIn <> upRecParser.io.rec }