diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-30 16:59:30 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-30 16:59:30 +0200 |
| commit | b09183db3bf5b08c1a1151e044f9df5f6dc445d8 (patch) | |
| tree | 811784ef879ba5fa31616c8b29e6e84a9885f106 /ice40 | |
| parent | 66a5b99f02b41c415911a7f2e045d167699cd82f (diff) | |
| download | nextpnr-b09183db3bf5b08c1a1151e044f9df5f6dc445d8.tar.gz nextpnr-b09183db3bf5b08c1a1151e044f9df5f6dc445d8.tar.bz2 nextpnr-b09183db3bf5b08c1a1151e044f9df5f6dc445d8.zip | |
Use DelayInfo for cell timing instead of delay_t
Signed-off-by: David Shah <davey1576@gmail.com>
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.cc | 14 | ||||
| -rw-r--r-- | ice40/arch.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 93a49dde..8162098c 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -775,29 +775,29 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const // ----------------------------------------------------------------------- -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 { if (cell->type == id_icestorm_lc) { if ((fromPort == id_i0 || fromPort == id_i1 || fromPort == id_i2 || fromPort == id_i3) && (toPort == id_o || toPort == id_lo)) { - delay = 450; + delay.delay = 450; return true; } else if (fromPort == id_cin && toPort == id_cout) { - delay = 120; + delay.delay = 120; return true; } else if (fromPort == id_i1 && toPort == id_cout) { - delay = 260; + delay.delay = 260; return true; } else if (fromPort == id_i2 && toPort == id_cout) { - delay = 230; + delay.delay = 230; return true; } else if (fromPort == id_clk && toPort == id_o) { - delay = 540; + delay.delay = 540; return true; } } else if (cell->type == id_icestorm_ram) { if (fromPort == id_rclk) { - delay = 2140; + delay.delay = 2140; return true; } } diff --git a/ice40/arch.h b/ice40/arch.h index 0243e978..8c6a3d93 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -722,7 +722,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 |