Merge pull request #31 from SebKuzminsky/spelling-fixes

fix some spelling mistakes in user-visible messages
This commit is contained in:
Clifford Wolf 2016-02-28 09:13:06 +01:00
commit 19ea5dd3df
3 changed files with 10 additions and 10 deletions

View File

@ -328,7 +328,7 @@ void FpgaConfig::read_bits(std::istream &ifs)
break; break;
default: default:
error("Unkown command: 0x%02x 0x%02x\n", command, payload); error("Unknown command: 0x%02x 0x%02x\n", command, payload);
} }
break; break;
@ -381,7 +381,7 @@ void FpgaConfig::read_bits(std::istream &ifs)
break; break;
default: default:
error("Unkown command: 0x%02x 0x%02x\n", command, payload); error("Unknown command: 0x%02x 0x%02x\n", command, payload);
} }
} }
@ -854,21 +854,21 @@ int FpgaConfig::chip_width() const
{ {
if (this->device == "1k") return 12; if (this->device == "1k") return 12;
if (this->device == "8k") return 32; if (this->device == "8k") return 32;
panic("Unkown chip type '%s'.\n", this->device.c_str()); panic("Unknown chip type '%s'.\n", this->device.c_str());
} }
int FpgaConfig::chip_height() const int FpgaConfig::chip_height() const
{ {
if (this->device == "1k") return 16; if (this->device == "1k") return 16;
if (this->device == "8k") return 32; if (this->device == "8k") return 32;
panic("Unkown chip type '%s'.\n", this->device.c_str()); panic("Unknown chip type '%s'.\n", this->device.c_str());
} }
vector<int> FpgaConfig::chip_cols() const vector<int> FpgaConfig::chip_cols() const
{ {
if (this->device == "1k") return vector<int>({18, 54, 54, 42, 54, 54, 54}); if (this->device == "1k") return vector<int>({18, 54, 54, 42, 54, 54, 54});
if (this->device == "8k") return vector<int>({18, 54, 54, 54, 54, 54, 54, 54, 42, 54, 54, 54, 54, 54, 54, 54, 54}); if (this->device == "8k") return vector<int>({18, 54, 54, 54, 54, 54, 54, 54, 42, 54, 54, 54, 54, 54, 54, 54, 54});
panic("Unkown chip type '%s'.\n", this->device.c_str()); panic("Unknown chip type '%s'.\n", this->device.c_str());
} }
string FpgaConfig::tile_type(int x, int y) const string FpgaConfig::tile_type(int x, int y) const
@ -886,7 +886,7 @@ string FpgaConfig::tile_type(int x, int y) const
return "logic"; return "logic";
} }
panic("Unkown chip type '%s'.\n", this->device.c_str()); panic("Unknown chip type '%s'.\n", this->device.c_str());
} }
int FpgaConfig::tile_width(const string &type) const int FpgaConfig::tile_width(const string &type) const
@ -896,7 +896,7 @@ int FpgaConfig::tile_width(const string &type) const
if (type == "ramb") return 42; if (type == "ramb") return 42;
if (type == "ramt") return 42; if (type == "ramt") return 42;
if (type == "io") return 18; if (type == "io") return 18;
panic("Unkown tile type '%s'.\n", type.c_str()); panic("Unknown tile type '%s'.\n", type.c_str());
} }
void FpgaConfig::cram_clear() void FpgaConfig::cram_clear()

View File

@ -84,12 +84,12 @@ int main(int argc, char **argv)
int best_divq = 0; int best_divq = 0;
if (f_pllin < 10 || f_pllin > 133) { if (f_pllin < 10 || f_pllin > 133) {
fprintf(stderr, "Error: PLL input freqency %.3f MHz is outside range 10 MHz - 133 MHz!\n", f_pllin); fprintf(stderr, "Error: PLL input frequency %.3f MHz is outside range 10 MHz - 133 MHz!\n", f_pllin);
exit(1); exit(1);
} }
if (f_pllout < 16 || f_pllout > 275) { if (f_pllout < 16 || f_pllout > 275) {
fprintf(stderr, "Error: PLL output freqency %.3f MHz is outside range 16 MHz - 275 MHz!\n", f_pllout); fprintf(stderr, "Error: PLL output frequency %.3f MHz is outside range 16 MHz - 275 MHz!\n", f_pllout);
exit(1); exit(1);
} }

View File

@ -1886,7 +1886,7 @@ int main(int argc, char **argv)
if (device_type.empty()) { if (device_type.empty()) {
device_type = "lp" + config_device; device_type = "lp" + config_device;
printf("// Warning: Missing -d paramter. Assuming '%s' device.\n", device_type.c_str()); printf("// Warning: Missing -d parameter. Assuming '%s' device.\n", device_type.c_str());
} }
if (device_type == "lp1k" || device_type == "hx1k") { if (device_type == "lp1k" || device_type == "hx1k") {