Merge branch 'ShinTop' into eb_dev

src/main/scala/backBoard/shin/Interface.scala

@@ -9,7 +9,7 @@ class CommonRegisterBundle extends Bundle{
 
   val hwVersion = UInt(8.W)
   val hwSerial  = UInt(48.W)
-  val busRate   = UInt(16.W)
+  val busRate   = UInt(8.W)
 
   val spiSel    = UInt(2.W)
 
@@ -96,6 +96,8 @@ class SlaveRegisterBundle extends Bundle{
   // val dcSyncWidth  = UInt(16.W)
 
 
+  val localDevIndex = UInt(16.W)
+
   //链路寄存器组
   // val isDevOnLeft = UInt(2.W)
   val isDevOnLeftModify = Bool()
@@ -168,6 +170,8 @@ class InterfaceIO extends Bundle{
   val mReg = Output(new MasterRegisterBundle)
   val sReg = Output(new SlaveRegisterBundle)
 
+  val localDevIndex = Input(UInt(16.W))
+
   // val isDevOnLeft = Input(UInt(2.W))
   val isDevOnLeftModify = Input(Bool())
   val indexOfLeftDev = Input(UInt(14.W))
@@ -239,22 +243,24 @@ abstract class InterfaceBase extends Module{
       
       Seq(
         (addr === "h8".U )  -> cReg.busRate( 7,0 ),
-        (addr === "h9".U )  -> cReg.busRate(15,8),
+        (addr === "h9".U )  -> cReg.spiSel,
+        (addr === "ha".U & isSlvMode)  -> sReg.localDevIndex,
+
 
         (addr === "h20".U & isMstMode) -> Cat(mReg.rxSM, mReg.txSM, 0.U(1.W) ),
                 (addr === "h21".U & isMstMode) -> mReg.txLength,
 
-        (addr === "h25".U & isMstMode) -> mReg.rplTimeStampTx(7,0),
-        (addr === "h26".U & isMstMode) -> mReg.rplTimeStampTx(15,8),
+        (addr === "h24".U & isMstMode) -> mReg.rplTimeStampTx(7,0),
+        (addr === "h25".U & isMstMode) -> mReg.rplTimeStampTx(15,8),
+
 
-        (addr === "h27".U ) -> cReg.spiSel
 
       ) ++
 
 
 
       ((0 until 16).map{ i =>
-        (addr === ("h80".U + i.U) ) -> cReg.encryptKey( 8*i+7,8*i+0 )
+        (addr === ("h50".U + i.U) ) -> cReg.encryptKey( 8*i+7,8*i+0 )
       }) ++
 
       Seq(
@@ -434,21 +440,16 @@ trait InterfaceMCUop{ this: InterfaceBase =>
       }.reverse
     )
   
-  cReg.busRate :=
-    Cat(
-      RegEnable( dataw, 0.U, isEnW & addrSel === "h9".U & cReg.mstOrSlv === 0.U ),
-      RegEnable( dataw, 0.U, isEnW & addrSel === "h8".U & cReg.mstOrSlv === 0.U )
-    )
+  cReg.busRate := RegEnable( dataw, 0.U, isEnW & addrSel === "h8".U & cReg.mstOrSlv === 0.U )
+  cReg.spiSel  := RegEnable( dataw(1,0), 0.U, isEnW & addrSel === "h9".U & cReg.mstOrSlv === 0.U )
 
   cReg.encryptKey :=
     Cat(
       (0 until 16).map{ i =>
-        RegEnable( dataw, 0.U, isEnW & addrSel === ("h80".U + i.U) & cReg.mstOrSlv === 0.U )
+        RegEnable( dataw, 0.U, isEnW & addrSel === ("h50".U + i.U) & cReg.mstOrSlv === 0.U )
       }.reverse
     )
 
-  cReg.spiSel :=
-    RegEnable( dataw(1,0), 0.U, isEnW & addrSel === "h27".U & cReg.mstOrSlv === 0.U )
 
 
   mReg.txSM     := RegEnable( dataw(2,1), 0.U, isEnW & addrSel === "h20".U )
@@ -457,8 +458,8 @@ trait InterfaceMCUop{ this: InterfaceBase =>
 
   mReg.rplTimeStampTx := 
     Cat(
-      RegEnable( dataw, 0.U, isEnW & addrSel === "h26".U ),
-      RegEnable( dataw, 0.U, isEnW & addrSel === "h25".U )
+      RegEnable( dataw, 0.U, isEnW & addrSel === "h25".U ),
+      RegEnable( dataw, 0.U, isEnW & addrSel === "h24".U )
     )
 
 
@@ -727,6 +728,9 @@ with InterfaceSync
   // io.smEnqAddr := cReg.smEnqAddr
   // io.smDeqAddr := cReg.smDeqAddr
 
+
+  sReg.localDevIndex := io.localDevIndex
+
   // sReg.isDevOnLeft        := io.isDevOnLeft
   sReg.isDevOnLeftModify  := io.isDevOnLeftModify
   sReg.indexOfLeftDev     := io.indexOfLeftDev

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

@@ -347,6 +347,8 @@ trait ShinTopSlave{ this: ShinTopBase =>
 
   interface.io.lvds <> slaveParser.io.lvds
 
+  interface.io.localDevIndex := slaveParser.io.localDevIndex
+
   //从站链路寄存器
   // interface.io.isDevOnLeft := slaveParser.io.isDevOnLeft
   interface.io.isDevOnLeftModify := slaveParser.io.isDevOnLeftModify

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

@@ -46,6 +46,9 @@ class SlaveParserIO extends Bundle{
 
   val trigAddr = Input( Vec(8, UInt(15.W)) )
 
+
+  val localDevIndex = Output(UInt(16.W))
+
   //开放链路寄存器组给interface
   // val isDevOnLeft        = Output(UInt(2.W))
   val isDevOnLeftModify  = Output(Bool())
@@ -97,13 +100,13 @@ abstract class SlaveParserBase extends Module{
   // val isDevOnLeft        = RegInit(0.U(2.W));  io.isDevOnLeft        := isDevOnLeft
   val isDevOnLeftModify  = RegInit(false.B);   io.isDevOnLeftModify  := isDevOnLeftModify
   val indexOfLeftDev     = RegInit(0.U(14.W)); io.indexOfLeftDev     := indexOfLeftDev
-  io.isDevOnRight       := Mux( isLastDevice, "b01".U, "b10".U )
+  io.isDevOnRight       := Mux( isLastDevice, "b00".U, "b01".U )
   val isDevOnRightModify = RegInit(false.B);   io.isDevOnRightModify := isDevOnRightModify
   val indexOfRightDev    = RegInit(0.U(14.W)); io.indexOfRightDev    := indexOfRightDev
 
   // val isDeviceModified: Bool = RegInit(true.B)
 
-  val localDevIndex = RegInit(0.U(14.W)) //当前设备索引
+  val localDevIndex = RegInit(0.U(14.W)); io.localDevIndex := localDevIndex //当前设备索引
   // dontTouch(localDevIndex)