ruige/eb001
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "最后几个比特锁不住"

Browse Source 
This reverts commit 97211f0962.
This commit is contained in:
RuigeLee
2024-09-23 17:40:35 +08:00
parent 97211f0962
commit 10b2e4c78f
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/backBoard/ebus/CDRIn.scala
View File

@@ -95,12 +95,10 @@ trait CDRInAxis{ this: CDRInBase =>
val operation = header(15,8) val operation = header(15,8)
val param = header( 7,0) val param = header( 7,0)
val isArbLock: Bool
val isPrebleLock = RegInit(false.B)
stateNext := stateNext :=
Mux1H(Seq( Mux1H(Seq(
(stateCurr === STATE_IDLE) -> ( Mux( isPrebleLock & (shiftData === ETH_SFD), STATE_HEADER, STATE_IDLE )), //IDLE (stateCurr === STATE_IDLE) -> ( Mux( isArbLock & (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_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_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 (stateCurr === STATE_CRC) -> ( Mux( (byteCnt === 3.U) & (bitCnt === 7.U), STATE_IDLE, STATE_CRC )), //CRC
@@ -108,21 +106,15 @@ trait CDRInAxis{ this: CDRInBase =>
val isArbLock: Bool
when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isArbLock ){ //first align
when( shiftData === ETH_PRE & stateCurr === STATE_IDLE & isArbLock ){
isPrebleLock := true.B
} .elsewhen( (shiftData =/= "h55".U & shiftData =/= "haa".U) | ~isArbLock ){
isPrebleLock := false.B
}
when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isPrebleLock ){ //first align
bitCnt := 0.U bitCnt := 0.U
} .otherwise{ } .otherwise{
bitCnt := bitCnt + 1.U bitCnt := bitCnt + 1.U
} }
when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isPrebleLock ){ //first align when( shiftData === ETH_SFD & stateCurr === STATE_IDLE & isArbLock ){ //first align
byteCnt := 0.U byteCnt := 0.U
} .elsewhen( bitCnt === 7.U ){ } .elsewhen( bitCnt === 7.U ){
when( stateCurr === STATE_HEADER ){ when( stateCurr === STATE_HEADER ){