Merge remote-tracking branch 'origin/eb_dev' into mp_eb_dev
# Conflicts: # tb/shinTest/ShinTopSpiTb.v # tb/shinTest/testcase_result/base_tc06_result.log
This commit is contained in:
@@ -30,6 +30,8 @@ class ShinTopIO extends Bundle{
|
||||
val interrupt = Output(Bool())
|
||||
|
||||
val latchPin = Input(Vec(2, Bool()))
|
||||
val hwSerial = Input(UInt(48.W))
|
||||
val uniCode = Input(UInt(64.W))
|
||||
}
|
||||
|
||||
|
||||
@@ -58,6 +60,8 @@ abstract class ShinTopBase extends Module{
|
||||
val interface = Module(new Interface)
|
||||
|
||||
interface.io.latchPin := io.latchPin
|
||||
interface.io.uniCode := io.uniCode
|
||||
interface.io.hwSerial := io.hwSerial
|
||||
|
||||
interface.io.intTransEnd(0) := downCDRIn.io.axis.fire & downCDRIn.io.axis.bits.tlast
|
||||
interface.io.intTransEnd(1) := downCDROut.io.axis.fire & downCDROut.io.axis.bits.tlast
|
||||
@@ -354,12 +358,12 @@ trait ShinTopSlave{ this: ShinTopBase =>
|
||||
|
||||
}
|
||||
|
||||
slaveParser.io.intHWClr(0) := interface.io.intHWClr(0)
|
||||
slaveParser.io.intHWClr(1) := interface.io.intHWClr(1)
|
||||
downCDRIn.reset := reset.asBool | interface.io.intHWClr(0)
|
||||
upCDRIn.reset := reset.asBool | interface.io.intHWClr(1)
|
||||
downCDROut.reset := reset.asBool | interface.io.intHWClr(0)
|
||||
upCDROut.reset := reset.asBool | interface.io.intHWClr(1)
|
||||
slaveParser.io.intHWClr(0) := interface.io.intHWTrig(0) & interface.io.intHWClr(0)
|
||||
slaveParser.io.intHWClr(1) := interface.io.intHWTrig(1) & interface.io.intHWClr(1)
|
||||
downCDRIn.reset := reset.asBool | ( interface.io.intHWTrig(0) & interface.io.intHWClr(0) )
|
||||
upCDRIn.reset := reset.asBool | ( interface.io.intHWTrig(1) & interface.io.intHWClr(1) )
|
||||
downCDROut.reset := reset.asBool | ( interface.io.intHWTrig(0) & interface.io.intHWClr(0) )
|
||||
upCDROut.reset := reset.asBool | ( interface.io.intHWTrig(1) & interface.io.intHWClr(1) )
|
||||
|
||||
interface.io.lvds <> slaveParser.io.lvds
|
||||
|
||||
|
||||
Reference in New Issue
Block a user