From 753586a65e2c25e6374fe0685de5139e15806bae Mon Sep 17 00:00:00 2001 From: RuigeLee Date: Mon, 23 Sep 2024 17:52:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=94=81=E4=BD=8F=EF=BC=8C?= =?UTF-8?q?=E4=B8=A2=E5=8C=85=E7=8E=87=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/scala/backBoard/ebus/CDRIn.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/scala/backBoard/ebus/CDRIn.scala b/src/main/scala/backBoard/ebus/CDRIn.scala index 0548824..ef87fbd 100644 --- a/src/main/scala/backBoard/ebus/CDRIn.scala +++ b/src/main/scala/backBoard/ebus/CDRIn.scala @@ -95,10 +95,12 @@ trait CDRInAxis{ this: CDRInBase => val operation = header(15,8) val param = header( 7,0) + val isArbLock: Bool + val checkSFD = ShiftRegister( shiftData, 8 ) stateNext := Mux1H(Seq( - (stateCurr === STATE_IDLE) -> ( Mux( isArbLock & (shiftData === ETH_SFD), STATE_HEADER, STATE_IDLE )), //IDLE + (stateCurr === STATE_IDLE) -> ( Mux( isArbLock & checkSFD === ETH_PRE & (shiftData === ETH_SFD), STATE_HEADER, STATE_IDLE )), //IDLE (stateCurr === STATE_HEADER) -> ( Mux( (byteCnt === (HeaderByte-1).U) & (bitCnt === 7.U), STATE_PAYLOAD, STATE_HEADER ) ), (stateCurr === STATE_PAYLOAD) -> ( Mux( (byteCnt === (payloadLen-1.U) ) & (bitCnt === 7.U), STATE_CRC, STATE_PAYLOAD )), // PAYLOAD (stateCurr === STATE_CRC) -> ( Mux( (byteCnt === 3.U) & (bitCnt === 7.U), STATE_IDLE, STATE_CRC )), //CRC @@ -106,15 +108,15 @@ trait CDRInAxis{ this: CDRInBase => - val isArbLock: Bool - when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isArbLock ){ //first align + + when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isArbLock & checkSFD === ETH_PRE ){ //first align bitCnt := 0.U } .otherwise{ bitCnt := bitCnt + 1.U } - when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isArbLock ){ //first align + when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isArbLock & checkSFD === ETH_PRE ){ //first align byteCnt := 0.U } .elsewhen( bitCnt === 7.U ){ when( stateCurr === STATE_HEADER ){