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 /ecp5 | |
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 'ecp5')
-rw-r--r-- | ecp5/arch.cc | 2 | ||||
-rw-r--r-- | ecp5/arch.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index b070014e..c1b51f34 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -442,7 +442,7 @@ DecalXY Arch::getGroupDecal(GroupId pip) const { return {}; }; // ----------------------------------------------------------------------- -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/ecp5/arch.h b/ecp5/arch.h index 445f0dbf..e2f33cae 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -802,7 +802,7 @@ struct Arch : BaseCtx // Get the delay through a cell from one port to another, returning false // if no path exists - 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; // Get the associated clock to a port, or empty if the port is combinational IdString getPortClock(const CellInfo *cell, IdString port) const; // Return true if a port is a clock |