diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-18 13:35:25 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-18 13:35:25 +0200 |
| commit | ad18cdb08787c4ecc88edaec353a96f59135c62d (patch) | |
| tree | 3a13281f1adea564d0848d93ef4bcf4d1d4bf952 /ice40/chip.h | |
| parent | 2f5e9542c2d9132b2c01d4dbc8c4d2dff97c60cf (diff) | |
| download | nextpnr-ad18cdb08787c4ecc88edaec353a96f59135c62d.tar.gz nextpnr-ad18cdb08787c4ecc88edaec353a96f59135c62d.tar.bz2 nextpnr-ad18cdb08787c4ecc88edaec353a96f59135c62d.zip | |
Rename Chip to Arch and ChipArgs to ArchArgs
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40/chip.h')
| -rw-r--r-- | ice40/chip.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ice40/chip.h b/ice40/chip.h index d3eb7c70..8ba42290 100644 --- a/ice40/chip.h +++ b/ice40/chip.h @@ -443,7 +443,7 @@ struct PipRange // ----------------------------------------------------------------------- -struct ChipArgs +struct ArchArgs { enum { @@ -458,7 +458,7 @@ struct ChipArgs std::string package; }; -struct Chip +struct Arch { const ChipInfoPOD *chip_info; const PackageInfoPOD *package_info; @@ -471,13 +471,14 @@ struct Chip std::vector<IdString> wire_to_net; std::vector<IdString> pip_to_net; std::vector<IdString> switches_locked; - Chip(ChipArgs args); - ChipArgs args; - // ------------------------------------------------- + ArchArgs args; + Arch(ArchArgs args); std::string getChipName(); + // ------------------------------------------------- + BelId getBelByName(IdString name) const; IdString getBelName(BelId bel) const @@ -641,7 +642,7 @@ struct Chip bool checkPipAvail(PipId pip) const { assert(pip != PipId()); - if (args.type == ChipArgs::UP5K) { + if (args.type == ArchArgs::UP5K) { int x = chip_info->pip_data[pip.index].x; if (x == 0 || x == (chip_info->width - 1)) return false; |