diff options
| author | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-18 04:49:50 +0000 |
|---|---|---|
| committer | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-18 04:49:50 +0000 |
| commit | 7e6332735d12f2e5ab9128648ed444bc123df512 (patch) | |
| tree | fc4f7a05be8691340c0003e10be400dc67defea0 /ice40 | |
| parent | dabc057da94207c1dfbb8d9679c639ff697bea14 (diff) | |
| parent | edf7bd09cf2a27fa1ada1a1e34cbe47c4bf0d48a (diff) | |
| download | nextpnr-7e6332735d12f2e5ab9128648ed444bc123df512.tar.gz nextpnr-7e6332735d12f2e5ab9128648ed444bc123df512.tar.bz2 nextpnr-7e6332735d12f2e5ab9128648ed444bc123df512.zip | |
Merge branch 'master' into 'master'
Master
See merge request eddiehung/nextpnr!3
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/archdefs.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |