Skip to content

Commit 539a063

Browse files
author
Oron Port
committed
fix unused constraints not taking effect
fixed vivado pull constraint property name
1 parent ce328a0 commit 539a063

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

core/src/main/scala/dfhdl/core/Design.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,13 @@ trait Design extends Container, HasClsMetaArgs:
7272
resourceOwner.getChildren.foreach(addUnusedPinPorts)
7373
resourceOwner.getResources.foreach {
7474
case pin: Pin if (!usedPinIDs.contains(pin.id)) =>
75-
val hasUnusedPullMode = pin.allSigConstraints.exists {
76-
case IO(unusedPullMode = unusedPullMode: IO.PullMode) => true
77-
case _ => false
75+
val unusedPullMode = pin.allSigConstraints.collectFirst {
76+
case IO(unusedPullMode = unusedPullMode: IO.PullMode) => unusedPullMode
7877
}
79-
if (hasUnusedPullMode)
80-
addUnusedPinPort(pin.id, pin.allSigConstraints)
78+
unusedPullMode.foreach(unusedPullMode =>
79+
// setting the pull mode as the unused pull mode
80+
addUnusedPinPort(pin.id, (IO(pullMode = unusedPullMode) :: pin.allSigConstraints).merge)
81+
)
8182
case _ =>
8283
}
8384
dfc.mutableDB.ResourceOwnershipContext.getTopResourceOwners.foreach(addUnusedPinPorts)

lib/src/main/scala/dfhdl/tools/toolsCore/Vivado.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class VivadoProjectConstraintsPrinter(using getSet: MemberGetSet, co: CompilerOp
217217
val pullModeStr = pullMode match
218218
case constraints.IO.PullMode.UP => "PULLUP"
219219
case constraints.IO.PullMode.DOWN => "PULLDOWN"
220-
addToDict("PULLMODE", pullModeStr)
220+
addToDict("PULLTYPE", pullModeStr)
221221
}
222222

223223
s"set_property -dict {$dict} ${xdc_get_ports(port, portConstraint)}"

0 commit comments

Comments
 (0)