diff options
| author | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-25 17:41:23 -0700 |
|---|---|---|
| committer | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-25 17:41:23 -0700 |
| commit | 7c8c13aba14ee51851506e0c1cfc0c995db21102 (patch) | |
| tree | fc2f58e44bf0f21b76f8ea31485458ddf5c60df6 /ecp5/arch.cc | |
| parent | 1fa738bd881f2951465586ae20f81f33743db73f (diff) | |
| parent | 7a8e8999d21205044e707a2765dc444531d69cef (diff) | |
| download | nextpnr-7c8c13aba14ee51851506e0c1cfc0c995db21102.tar.gz nextpnr-7c8c13aba14ee51851506e0c1cfc0c995db21102.tar.bz2 nextpnr-7c8c13aba14ee51851506e0c1cfc0c995db21102.zip | |
Merge remote-tracking branch 'origin/master' into redist_slack
Diffstat (limited to 'ecp5/arch.cc')
| -rw-r--r-- | ecp5/arch.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 2e8f7987..b518323e 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -328,7 +328,8 @@ BelId Arch::getPackagePinBel(const std::string &pin) const std::string Arch::getBelPackagePin(BelId bel) const { for (int i = 0; i < package_info->num_pins; i++) { - if (package_info->pin_data[i].abs_loc == bel.location && package_info->pin_data[i].bel_index == bel.index) { + if (Location(package_info->pin_data[i].abs_loc) == bel.location && + package_info->pin_data[i].bel_index == bel.index) { return package_info->pin_data[i].name.get(); } } @@ -338,7 +339,7 @@ std::string Arch::getBelPackagePin(BelId bel) const int Arch::getPioBelBank(BelId bel) const { for (int i = 0; i < chip_info->num_pios; i++) { - if (chip_info->pio_info[i].abs_loc == bel.location && chip_info->pio_info[i].bel_index == bel.index) { + if (Location(chip_info->pio_info[i].abs_loc) == bel.location && chip_info->pio_info[i].bel_index == bel.index) { return chip_info->pio_info[i].bank; } } @@ -348,7 +349,7 @@ int Arch::getPioBelBank(BelId bel) const std::string Arch::getPioFunctionName(BelId bel) const { for (int i = 0; i < chip_info->num_pios; i++) { - if (chip_info->pio_info[i].abs_loc == bel.location && chip_info->pio_info[i].bel_index == bel.index) { + if (Location(chip_info->pio_info[i].abs_loc) == bel.location && chip_info->pio_info[i].bel_index == bel.index) { const char *func = chip_info->pio_info[i].function_name.get(); if (func == nullptr) return ""; |