diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-30 18:14:40 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-30 18:14:40 -0700 |
| commit | 46b74696527d3b217070ff4820b537e0b989a00f (patch) | |
| tree | da95e6dc441eb8608cd77d1eea218ec9cb5f26fb /generic | |
| parent | 9c45f762c8280b5f7948df15554e54a38a896da2 (diff) | |
| parent | 7da64ee167d518641a479cad1b660c608fb3dede (diff) | |
| download | nextpnr-46b74696527d3b217070ff4820b537e0b989a00f.tar.gz nextpnr-46b74696527d3b217070ff4820b537e0b989a00f.tar.bz2 nextpnr-46b74696527d3b217070ff4820b537e0b989a00f.zip | |
Merge remote-tracking branch 'origin/master' into redist_slack
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/arch.cc | 2 | ||||
| -rw-r--r-- | generic/arch.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/arch.cc b/generic/arch.cc index ce6fe50a..daaa8118 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -427,7 +427,7 @@ DecalXY Arch::getGroupDecal(GroupId group) const { return groups.at(group).decal // --------------------------------------------------------------- -bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, delay_t &delay) const +bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const { return false; } diff --git a/generic/arch.h b/generic/arch.h index b6892c85..e508e0e4 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -211,7 +211,7 @@ struct Arch : BaseCtx DecalXY getPipDecal(PipId pip) const; DecalXY getGroupDecal(GroupId group) const; - bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, delay_t &delay) const; + bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const; IdString getPortClock(const CellInfo *cell, IdString port) const; bool isClockPort(const CellInfo *cell, IdString port) const; |