Merge branch 'master' of github.com:YosysHQ/nextpnr into constids

1 files changed, 3 insertions, 4 deletions

diff --git a/ecp5/arch.h b/ecp5/arch.h
index b6cc313f..3e2f203b 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -414,6 +414,7 @@ struct Arch : BaseCtx
     std::string getChipName() const;
 
     IdString archId() const { return id("ecp5"); }
+    ArchArgs archArgs() const { return args; }
     IdString archArgsToId(ArchArgs args) const;
 
     // -------------------------------------------------
@@ -824,10 +825,8 @@ 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, 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
-    bool isClockPort(const CellInfo *cell, IdString port) const;
+    // Get the port class, also setting clockPort if applicable
+    TimingPortClass getPortTimingClass(const CellInfo *cell, IdString port, IdString &clockPort) const;
     // Return true if a port is a net
     bool isGlobalNet(const NetInfo *net) const;