diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-08-08 17:22:05 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-08-08 17:22:05 +0200 |
| commit | abf5ea84b9700c72a19327cda1000db0f80b34e0 (patch) | |
| tree | 85640fd051e31cf4e4c236cafabba3280ac8e343 /generic | |
| parent | f875a37467477aa0aa60ba89b428c71de6645736 (diff) | |
| download | nextpnr-abf5ea84b9700c72a19327cda1000db0f80b34e0.tar.gz nextpnr-abf5ea84b9700c72a19327cda1000db0f80b34e0.tar.bz2 nextpnr-abf5ea84b9700c72a19327cda1000db0f80b34e0.zip | |
Get rid of BelType and PortPin in generic arch
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/arch.cc | 10 | ||||
| -rw-r--r-- | generic/arch.h | 14 | ||||
| -rw-r--r-- | generic/archdefs.h | 3 |
3 files changed, 9 insertions, 18 deletions
diff --git a/generic/arch.cc b/generic/arch.cc index 0fa93da8..a6d41e1e 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -238,15 +238,15 @@ CellInfo *Arch::getConflictingBelCell(BelId bel) const { return bels.at(bel).bou const std::vector<BelId> &Arch::getBels() const { return bel_ids; } -BelType Arch::getBelType(BelId bel) const { return bels.at(bel).type; } +IdString Arch::getBelType(BelId bel) const { return bels.at(bel).type; } -WireId Arch::getBelPinWire(BelId bel, PortPin pin) const { return bels.at(bel).pins.at(pin).wire; } +WireId Arch::getBelPinWire(BelId bel, IdString pin) const { return bels.at(bel).pins.at(pin).wire; } -PortType Arch::getBelPinType(BelId bel, PortPin pin) const { return bels.at(bel).pins.at(pin).type; } +PortType Arch::getBelPinType(BelId bel, IdString pin) const { return bels.at(bel).pins.at(pin).type; } -std::vector<PortPin> Arch::getBelPins(BelId bel) const +std::vector<IdString> Arch::getBelPins(BelId bel) const { - std::vector<PortPin> ret; + std::vector<IdString> ret; for (auto &it : bels.at(bel).pins) ret.push_back(it.first); return ret; diff --git a/generic/arch.h b/generic/arch.h index 59fe8d05..b38d5916 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -128,12 +128,6 @@ struct Arch : BaseCtx IdString archId() const { return id("generic"); } IdString archArgsToId(ArchArgs args) const { return id("none"); } - IdString belTypeToId(BelType type) const { return type; } - IdString portPinToId(PortPin type) const { return type; } - - BelType belTypeFromId(IdString id) const { return id; } - PortPin portPinFromId(IdString id) const { return id; } - int getGridDimX() const { return gridDimX; } int getGridDimY() const { return gridDimY; } int getTileDimZ(int x, int y) const { return tileDimZ[x][y]; } @@ -151,10 +145,10 @@ struct Arch : BaseCtx CellInfo *getBoundBelCell(BelId bel) const; CellInfo *getConflictingBelCell(BelId bel) const; const std::vector<BelId> &getBels() const; - BelType getBelType(BelId bel) const; - WireId getBelPinWire(BelId bel, PortPin pin) const; - PortType getBelPinType(BelId bel, PortPin pin) const; - std::vector<PortPin> getBelPins(BelId bel) const; + IdString getBelType(BelId bel) const; + WireId getBelPinWire(BelId bel, IdString pin) const; + PortType getBelPinType(BelId bel, IdString pin) const; + std::vector<IdString> getBelPins(BelId bel) const; WireId getWireByName(IdString name) const; IdString getWireName(WireId wire) const; diff --git a/generic/archdefs.h b/generic/archdefs.h index b318d5af..2452aa17 100644 --- a/generic/archdefs.h +++ b/generic/archdefs.h @@ -46,9 +46,6 @@ struct DelayInfo } }; -typedef IdString BelType; -typedef IdString PortPin; - typedef IdString BelId; typedef IdString WireId; typedef IdString PipId; |