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 /common/nextpnr.h | |
| 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 'common/nextpnr.h')
| -rw-r--r-- | common/nextpnr.h | 4 |
1 files changed, 2 insertions, 2 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; |