Revert "从机上下行机制分叉"

This reverts commit a9f4fd18ab.

src/main/scala/backBoard/BackBoardSlv.scala

@@ -32,8 +32,6 @@ abstract class BackBoardSlvBase extends Module{
   
   val downRegTemp = RegInit(VecInit( Seq(15.U(8.W)) ++ Seq.fill(31){0.U(8.W)} ))
   val upReg       = WireDefault(VecInit((0 until 32).map{i => 0.U(8.W)}))
-
-  val isCrcPass = io.lvdsSlv.downstream_rx_crc_valid & ~io.lvdsSlv.downstream_rx_crc_err
 }
 
 
@@ -50,7 +48,7 @@ trait BackBoardSlvDown{ this: BackBoardSlvBase =>
     downCnt := 0.U
   }
 
-
+  val isCrcPass = io.lvdsSlv.downstream_rx_crc_valid & ~io.lvdsSlv.downstream_rx_crc_err
 
   // when( io.lvdsSlv.downstream_rx_crc_valid ){
   //   when( ~io.lvdsSlv.downstream_rx_crc_err ){

src/main/scala/backBoard/DIn16.scala

@@ -112,7 +112,7 @@ trait BackBoardSlvIn16 { this: BackBoardSlvLocal =>
 
 
 
-class DIn16 extends BackBoardSlvLocal with BackBoardSlvDown with BackBoardSlvUp
+class DIn16 extends BackBoardSlvLocal
 with BackBoardSlvStatusPR
 with BackBoardSlvIn16{
   

src/main/scala/backBoard/Dout16.scala

@@ -19,7 +19,7 @@ trait BackBoardSlvOut16{ this: BackBoardSlvLocal =>
 }
 
 
-class DOut16 extends BackBoardSlvLocal with BackBoardSlvDown with BackBoardSlvUp
+class DOut16 extends BackBoardSlvLocal
 with BackBoardSlvStatusPR
 with BackBoardSlvOut16{
   val out = IO(Output(UInt(16.W)))

src/main/scala/backBoard/LocalRegisters.scala

@@ -12,7 +12,7 @@ class ManualParamBundle extends Bundle{
 }
 
 
-abstract class BackBoardSlvLocal extends BackBoardSlvBase{
+abstract class BackBoardSlvLocal extends BackBoardSlvBase with BackBoardSlvDown with BackBoardSlvUp{
 
   val param = IO(Input( new ManualParamBundle ))
 

src/main/scala/backBoard/Qei.scala

@@ -96,8 +96,7 @@ trait BackBoardSlvQei{ this: BackBoardSlvLocal =>
 }        
 
 
-class Qei extends BackBoardSlvLocal with BackBoardSlvDown with BackBoardSlvUp
+class Qei extends BackBoardSlvLocal with BackBoardSlvStatusPR with BackBoardSlvQei{
-with BackBoardSlvStatusPR with BackBoardSlvQei{
   val phaseAIO    = for( i <- 0 until 2 ) yield { IO(Input(Bool())) }
   val phaseBIO    = for( i <- 0 until 2 ) yield { IO(Input(Bool())) }
   val phaseZIO    = for( i <- 0 until 2 ) yield { IO(Input(Bool())) }