临时切换

src/main/scala/backBoard/shin/MasterParser.scala

@@ -1,100 +1,122 @@
-// package BACK
+package BACK
 
-// import chisel3._
+import chisel3._
-// import chisel3.util._
+import chisel3.util._
 
-// class MasterParserIO extends Module{
+class MasterParserIO extends Module{
-//   val downOut = Decoupled(new AXIS_Bundle(8))
+  val downOut = Decoupled(new AXIS_Bundle(8))
-//   val upIn  = Flipped( Decoupled(new AXIS_Bundle(8)) )
+  val upIn  = Flipped( Decoupled(new AXIS_Bundle(8)) )
 
-//   val sram_r = Flipped(new ShareSRAMIO)
+  val sram_r = Flipped(new ShareSRAMIO)
-//   val sram_w = Flipped(new ShareSRAMIO)
+  val sram_w = Flipped(new ShareSRAMIO)
 
-//   val req = Valid(new Bundle{
+  val req = Valid(new Bundle{
-//     val length  = UInt(12.W)
+    val txAddr    = UInt(15.W)
-//   })
+    val rxAddr    = UInt(15.W)
-//   val rsp = Valid(new Bundle{
+    val length  = UInt(12.W)
-//     val isError = Bool()
+  })
-//     val length  = UInt(12.W)
+  val rsp = Valid(new Bundle{
-//   })
+    val isError = Bool()
+    val length  = UInt(12.W)
+  })
 
+  val rxEnq = Output( Bool())
+  val txDeq  = Output( Bool())
 
+  val trigAddr = Input( Vec(2, UInt(15.W)) )
 
-// }
+  val timeStamp = Input(UInt(64.W))
 
-// abstract class MasterParserBase extends Module{
+}
-//   val io: MasterParserIO = IO(new MasterParserIO)
 
-//   val sendCnt = Reg(UInt(11.W))
+abstract class MasterParserBase extends Module{
-//   val sendLen = Reg(UInt(11.W))
+  val io: MasterParserIO = IO(new MasterParserIO)
 
-//   val reqReady = RegInit(true.B)
+  val sendCnt = Reg(UInt(11.W))
-//   val sendAddr = Reg(UInt(12.W))
+  val sendLen = Reg(UInt(11.W))
+  val txAddr = Reg(UInt(15.W))
 
-//   io.req.ready := reqReady
+  val rxCnt = Reg(UInt(11.W))
+  val rxAddr = Reg(UInt(15.W))
 
-//   when( io.req.fire ){
+  val reqReady = RegInit(true.B)
-//     reqReady := false.B
+  val sendAddr = Reg(UInt(12.W))
-//   } .elsewhen( io.downOut.fire & sendCnt === sendLen ){
-//     reqReady := true.B
-//   }
 
-//   when( io.req.fire ){
+  io.req.ready := reqReady
-//     sendLen := io.req.bits.length
-//     sendCnt := 0.U
-//   } .elsewhen( io.downOut.fire ){
-//     sendCnt := sendCnt + 1.U
-//   }
 
-//   when( reqReady ){
+  when( io.req.fire ){
-//     sendAddr := 0.U
+    reqReady := false.B
-//   } .elsewhen( io.downOut.fire ){
+  } .elsewhen( io.downOut.fire & sendCnt === sendLen ){
-//     sendAddr := sendAddr + 1.U
+    reqReady := true.B
-//   }
+  }
 
-//   io.sram_r.enr := 
+  when( io.req.fire ){
-//     io.req.fire | io.downOut.fire
+    sendLen  := io.req.bits.length
+    sendCnt  := 0.U
+  } .elsewhen( io.downOut.fire ){
+    sendCnt := sendCnt + 1.U
+  }
 
-//   io.sram_r.addr := Mux( io.req.fire, io.req.bits.addr, sendCnt )
+  when( io.req.fire ){
+    txAddr := io.req.bits.txAddr
+  } .elsewhen( io.downOut.fire ){
+    txAddr := txAddr + 1.U
+  }
 
-//   io.downOut.valid := ~reqReady
+  when( io.req.fire ){
-//   io.downOut.bits.tdata := io.req.bits.datar
+    rxAddr := io.req.bits.rxAddr
-//   io.downOut.bits.tuser := false.B 
+  } .elsewhen( io.upIn.fire ){
-//   io.downOut.bits.tlast := sendCnt === sendLen
+    rxAddr := rxAddr + 1.U
+  }
 
+  when( reqReady ){
+    sendAddr := 0.U
+  } .elsewhen( io.downOut.fire ){
+    sendAddr := sendAddr + 1.U
+  }
 
+  io.sram_r.enr := 
+    io.req.fire | io.downOut.fire
 
+  io.sram_r.addr := Mux( io.req.fire, io.req.bits.txAddr, txAddr + 1.U )
 
-//   val recAddr = Reg(UInt(12.W))
+  io.downOut.valid := ~reqReady
-
+  io.downOut.bits.tdata := io.sram_r.datar
-//   io.upIn.ready := true.B
+  io.downOut.bits.tuser := false.B 
-
+  io.downOut.bits.tlast := sendCnt === sendLen
-//   io.sram_w.enw := io.upIn.fire
-//   io.sram_w.addr := recAddr
-//   io.sram_w.dataw := io.upIn.bits.tdata
-
-
-//   when( io.upIn.fire ){
-//     when( io.upIn.bits.tlast ){
-//       recAddr := 0.U
-//     } .otherwise{
-//       recAddr := recAddr + 1.U
-//     }
-//   }
-
-//   io.rsp.valid := io.upIn.fire & io.upIn.bits.tlast
-//   io.rsp.bits.isError := io.upIn.fire & io.upIn.bits.tuser
-//   io.rsp.bits.length  := recAddr
 
 
 
 
 
+  when( io.req.fire ){
+    rxCnt := 0.U
+  } .elsewhen( io.upIn.fire ){
+    rxCnt := rxCnt + 1.U
+  }
 
 
-// }
+  io.upIn.ready := true.B
+
+  io.sram_w.enw := io.upIn.fire
+  io.sram_w.addr := rxAddr
+  io.sram_w.dataw := io.upIn.bits.tdata
 
 
-// class MasterParser extends MasterParserBase{
+  io.rsp.valid := io.upIn.fire & io.upIn.bits.tlast
+  io.rsp.bits.isError := io.upIn.fire & io.upIn.bits.tuser
+  io.rsp.bits.length  := rxCnt + 1.U
 
-// }
+
+
+  io.rxEnq := io.trigAddr(0) === txCnt         & io.downOut.fire
+  io.txDeq := io.trigAddr(1) === (rxCnt + 1.U) & io.upIn.fire
+
+
+
+}
+
+
+class MasterParser extends MasterParserBase{
+
+}

src/main/scala/backBoard/shin/ShinTop.scala

@@ -32,18 +32,19 @@ class ShinTopIO extends Bundle{
   val sram_r = Vec( 4, new SRAM2kRDIO) //QSPI
 
 
+  val modeSel = Input(Bool())
 }
 
 
 
-class ShinTop extends Module{
+abstract class ShinTopBase extends Module{
   val io: ShinTopIO = IO(new ShinTopIO)
 
   // val CDRIn = for( i <- 0 until 2 ) yield { Module(new CDRIn) }
 	// val CDROut = for( i <- 0 until 2 ) yield { Module(new CDROut) }
 
 	val slaveParser  = Module(new SlaveParser )
-	// val masterParser = Module(new MasterParser)
+	val masterParser = Module(new MasterParser)
 
 
   val smUnit = Seq(
@@ -69,20 +70,14 @@ class ShinTop extends Module{
   )
 
 
-  smUnit(0).io.sram_w := slaveParser.io.sram_w(0)
+
-  smUnit(2).io.sram_w := slaveParser.io.sram_w(1)
-  smUnit(4).io.sram_w := slaveParser.io.sram_w(2)
-  smUnit(6).io.sram_w := slaveParser.io.sram_w(3)
 
   smUnit(0).io.sram_r <> io.sram_r(0)
   smUnit(2).io.sram_r <> io.sram_r(1)
   smUnit(4).io.sram_r <> io.sram_r(2)
   smUnit(6).io.sram_r <> io.sram_r(3)
 
-  smUnit(1).io.sram_r <> slaveParser.io.sram_r(0)
+
-  smUnit(3).io.sram_r <> slaveParser.io.sram_r(1)
-  smUnit(5).io.sram_r <> slaveParser.io.sram_r(2)
-  smUnit(7).io.sram_r <> slaveParser.io.sram_r(3)
 
   smUnit(1).io.sram_w := io.sram_w(0)
   smUnit(3).io.sram_w := io.sram_w(1)
@@ -90,11 +85,6 @@ class ShinTop extends Module{
   smUnit(7).io.sram_w := io.sram_w(3)
 
 
-  smUnit(0).io.enq := slaveParser.io.dSMenq(0)
-  smUnit(2).io.enq := slaveParser.io.dSMenq(1)
-  smUnit(4).io.enq := slaveParser.io.dSMenq(2)
-  smUnit(6).io.enq := slaveParser.io.dSMenq(3)
-
   smUnit(0).io.deq := io.dSMdeq(0)
   smUnit(2).io.deq := io.dSMdeq(1)
   smUnit(4).io.deq := io.dSMdeq(2)
@@ -106,11 +96,29 @@ class ShinTop extends Module{
   smUnit(5).io.enq := io.uSMenq(2)
   smUnit(7).io.enq := io.uSMenq(3)
 
+
+
+  when( io.modeSel === false.B ){
+    smUnit(0).io.sram_w := slaveParser.io.sram_w(0)
+    smUnit(2).io.sram_w := slaveParser.io.sram_w(1)
+    smUnit(4).io.sram_w := slaveParser.io.sram_w(2)
+    smUnit(6).io.sram_w := slaveParser.io.sram_w(3)
+
+    smUnit(1).io.sram_r <> slaveParser.io.sram_r(0)
+    smUnit(3).io.sram_r <> slaveParser.io.sram_r(1)
+    smUnit(5).io.sram_r <> slaveParser.io.sram_r(2)
+    smUnit(7).io.sram_r <> slaveParser.io.sram_r(3)
+
+    smUnit(0).io.enq := slaveParser.io.dSMenq(0)
+    smUnit(2).io.enq := slaveParser.io.dSMenq(1)
+    smUnit(4).io.enq := slaveParser.io.dSMenq(2)
+    smUnit(6).io.enq := slaveParser.io.dSMenq(3)
+
     smUnit(1).io.deq := slaveParser.io.uSMdeq(0)
     smUnit(3).io.deq := slaveParser.io.uSMdeq(1)
     smUnit(5).io.deq := slaveParser.io.uSMdeq(2)
     smUnit(7).io.deq := slaveParser.io.uSMdeq(3)    
-
+  }
 
 
 
@@ -145,11 +153,70 @@ class ShinTop extends Module{
 
 
 
-
+  when(io.modeSel === false.B ){
     slaveParser.io.downIn  <> io.downIn
     slaveParser.io.downOut <> io.downOut
     slaveParser.io.upIn    <> io.upIn
     slaveParser.io.upOut   <> io.upOut    
+  }
+
+
+
+
+
+
+
+
+
+}
+
+
+trait ShinTopMaster{ this: ShinTopBase =>
+    val downOut = Decoupled(new AXIS_Bundle(8))
+    val upIn  = Flipped( Decoupled(new AXIS_Bundle(8)) )
+
+
+  when( io.modeSel === true.B ){
+    smUnit(0).io.sram_w := masterParser.io.sram_w(0)
+    smUnit(1).io.sram_r <> masterParser.io.sram_r(0)
+
+
+    smUnit(0).io.enq := slaveParser.io.rxEnq
+    smUnit(1).io.deq := slaveParser.io.txDeq
+
+  }
+    val sram_r = Flipped(new ShareSRAMIO)
+    val sram_w = Flipped(new ShareSRAMIO)
+
+    val req = Valid(new Bundle{
+      val txAddr    = UInt(15.W)
+      val rxAddr    = UInt(15.W)
+      val length  = UInt(12.W)
+    })
+    val rsp = Valid(new Bundle{
+      val isError = Bool()
+      val length  = UInt(12.W)
+    })
+
+    val txDeq = Output( Bool())
+    val rx Enq  = Output( Bool())
+
+  masterParser.io.trigAddr(0) := "hff".U
+  masterParser.io.trigAddr(1) := "hff".U
+
+  masterParser.io.timeStamp := io.timeStamp
+}
+
+
+trait ShinTopSlave{ this: ShinTopBase =>
+
+
+  when( io.modeSel === false.B ){
+    slaveParser.io.downIn  <> io.downIn
+    slaveParser.io.downOut <> io.downOut
+    slaveParser.io.upIn    <> io.upIn
+    slaveParser.io.upOut   <> io.upOut
+  }
 
   slaveParser.io.timeStamp := io.timeStamp
 
@@ -167,4 +234,39 @@ class ShinTop extends Module{
 
 
 
+  when( io.modeSel === false.B ){
+    smUnit(0).io.sram_w := slaveParser.io.sram_w(0)
+    smUnit(2).io.sram_w := slaveParser.io.sram_w(1)
+    smUnit(4).io.sram_w := slaveParser.io.sram_w(2)
+    smUnit(6).io.sram_w := slaveParser.io.sram_w(3)
+
+    smUnit(1).io.sram_r <> slaveParser.io.sram_r(0)
+    smUnit(3).io.sram_r <> slaveParser.io.sram_r(1)
+    smUnit(5).io.sram_r <> slaveParser.io.sram_r(2)
+    smUnit(7).io.sram_r <> slaveParser.io.sram_r(3)
+
+    smUnit(0).io.enq := slaveParser.io.dSMenq(0)
+    smUnit(2).io.enq := slaveParser.io.dSMenq(1)
+    smUnit(4).io.enq := slaveParser.io.dSMenq(2)
+    smUnit(6).io.enq := slaveParser.io.dSMenq(3)
+
+    smUnit(1).io.deq := slaveParser.io.uSMdeq(0)
+    smUnit(3).io.deq := slaveParser.io.uSMdeq(1)
+    smUnit(5).io.deq := slaveParser.io.uSMdeq(2)
+    smUnit(7).io.deq := slaveParser.io.uSMdeq(3)    
   }
+
+
+
+
+
+}
+
+
+
+
+
+
+class ShinTop extends ShinTopBase
+with ShinTopMaster
+with ShinTopSlave

src/main/scala/backBoard/shin/SlaveParser.scala

@@ -117,12 +117,6 @@ abstract class SlaveParserBase extends Module{
   }
 
 
-
-
-  // val isDownSendProbe: Bool //下行探针
-  // val isUpSendProbe: Bool   //上行探针
-  // val probeFrame: FrameHeader //固定化探针内容
-
   downSendGen.io.frameReq.valid :=
     isDownSendPend & downRecParser.io.subMsgReq.fire //| 下行转发
     //isDownSendProbe  //下行探针
@@ -367,9 +361,6 @@ trait SlaveParserIndex{ this: SlaveParserBase =>
 trait SlaveParserRW{ this: SlaveParserBase =>
 
 
-
-
-
   //下行接收
   when( downRecParser.io.subMsgReq.fire ){
     when( isDownRecPing ){