diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-07-17 20:04:49 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-07-17 20:04:49 +0200 |
| commit | ddfc535df766a8d6091e6c043b74bb6a40c8d2b7 (patch) | |
| tree | 427f283948362a06ae32416a09a92c77446722b0 | |
| parent | 3ef85b30b461972d264d7e259eca25762356c16e (diff) | |
| download | nextpnr-ddfc535df766a8d6091e6c043b74bb6a40c8d2b7.tar.gz nextpnr-ddfc535df766a8d6091e6c043b74bb6a40c8d2b7.tar.bz2 nextpnr-ddfc535df766a8d6091e6c043b74bb6a40c8d2b7.zip | |
Add ArchNetInfo and ArchCellInfo
Signed-off-by: Clifford Wolf <clifford@clifford.at>
| -rw-r--r-- | common/nextpnr.h | 4 | ||||
| -rw-r--r-- | ecp5/archdefs.h | 3 | ||||
| -rw-r--r-- | generic/archdefs.h | 3 | ||||
| -rw-r--r-- | ice40/archdefs.h | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index 50465869..3d0cc955 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -200,7 +200,7 @@ struct PipMap PlaceStrength strength = STRENGTH_NONE; }; -struct NetInfo +struct NetInfo : ArchNetInfo { IdString name; PortRef driver; @@ -225,7 +225,7 @@ struct PortInfo PortType type; }; -struct CellInfo +struct CellInfo : ArchCellInfo { IdString name, type; std::unordered_map<IdString, PortInfo> ports; diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index 84a431fd..df1add44 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -129,6 +129,9 @@ struct DecalId } }; +struct ArchNetInfo { }; +struct ArchCellInfo { }; + NEXTPNR_NAMESPACE_END namespace std { diff --git a/generic/archdefs.h b/generic/archdefs.h index 9969014b..f5999776 100644 --- a/generic/archdefs.h +++ b/generic/archdefs.h @@ -52,4 +52,7 @@ typedef IdString PipId; typedef IdString GroupId; typedef IdString DecalId; +struct ArchNetInfo { }; +struct ArchCellInfo { }; + NEXTPNR_NAMESPACE_END diff --git a/ice40/archdefs.h b/ice40/archdefs.h index 75df678a..ce7d3f52 100644 --- a/ice40/archdefs.h +++ b/ice40/archdefs.h @@ -150,6 +150,9 @@ struct DecalId bool operator!=(const DecalId &other) const { return (type != other.type) || (index != other.index); } }; +struct ArchNetInfo { }; +struct ArchCellInfo { }; + NEXTPNR_NAMESPACE_END namespace std { @@ -201,5 +204,4 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId> return seed; } }; - } // namespace std |