Fix whitespace and a couple of typos

This commit is contained in:
David Shah 2017-11-20 09:43:54 +00:00
parent 8c0fe225ca
commit da7a2a9d0d
11 changed files with 14 additions and 14 deletions

View File

@ -1,4 +1,4 @@
set_io clk 44
set_io rstn 27
set_io LED1 12
set_io LED2 13
set_io LED2 13

View File

@ -68,4 +68,4 @@ assign LED2 = 1'b0;
endmodule
endmodule

View File

@ -1,3 +1,3 @@
set_io RGB0 39
set_io RGB1 40
set_io RGB2 41
set_io RGB2 41

View File

@ -78,4 +78,4 @@ defparam RGBA_DRIVER.RGB1_CURRENT = "0b000011";
defparam RGBA_DRIVER.RGB2_CURRENT = "0b000011";
endmodule
endmodule

View File

@ -642,7 +642,7 @@ class iceconfig:
if s[0] == 0 and s[1] == 0:
if direction == "l": s = (0, 1, vert_net)
if direction == "b": s = (1, 0, horz_net)
if s[0] == self.max_x and s[1] == self.max_y:
if direction == "r": s = (self.max_x, self.max_y-1, vert_net)
if direction == "t": s = (self.max_x-1, self.max_y, horz_net)
@ -677,11 +677,11 @@ class iceconfig:
if s[0] == 0 and s[1] == self.max_y:
if direction == "l": s = (0, self.max_y-1, vert_net)
if direction == "t": s = (1, self.max_y, horz_net)
if s[0] == self.max_x and s[1] == 0:
if direction == "r": s = (self.max_x, 1, vert_net)
if direction == "b": s = (self.max_x-1, 0, horz_net)
if self.tile_has_net(s[0], s[1], s[2]):
neighbours.add((s[0], s[1], s[2]))

View File

@ -1 +1 @@
work_dsp_cbit/
work_dsp_cbit/

View File

@ -1 +1 @@
work_rgba_drv/
work_rgba_drv/

View File

@ -171,4 +171,4 @@ set_io b_led 41
dat.write(("\"RGBA_DRV_EN\":").ljust(24) + bit_to_str(rgba_drv_en_bit[device]) + ",\n")
print(("\"" + fuzz_bit + "\":").ljust(24) + bit_to_str(new_bits[0]) + ",")
dat.write(("\"" + fuzz_bit + "\":").ljust(24) + bit_to_str(new_bits[0]) + ",\n")
do_fuzz()
do_fuzz()

View File

@ -1 +1 @@
work_spram/
work_spram/

View File

@ -171,4 +171,4 @@ with open(device + "_spram_data.txt", "w") as f:
for cnet in data[net]:
cnets.append("(%d, %d, \"%s\")" % cnet)
print("\t\t%s %s, " % (("\"" + net.replace("[","_").replace("]","") + "\":").ljust(24), " ".join(cnets)), file=f)
print("\t},", file=f)
print("\t},", file=f)

View File

@ -1013,7 +1013,7 @@ vector<int> FpgaConfig::chip_cols() const
{
if (this->device == "384") return vector<int>({18, 54, 54, 54, 54});
if (this->device == "1k") return vector<int>({18, 54, 54, 42, 54, 54, 54});
// Its ipconect or Mutiplier block, five logic, ram, six logic.
// Its IPConnect or Mutiplier block, five logic, ram, six logic.
if (this->device == "5k") return vector<int>({54, 54, 54, 54, 54, 54, 42, 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("Unknown chip type '%s'.\n", this->device.c_str());
@ -1022,7 +1022,7 @@ vector<int> FpgaConfig::chip_cols() const
string FpgaConfig::tile_type(int x, int y) const
{
if ((x == 0 || x == this->chip_width()+1) && (y == 0 || y == this->chip_height()+1)) return "corner";
// The sides on the 5k devices are ipconect or DSP tiles
// The sides on the 5k devices are IPConnect or DSP tiles
if (this->device == "5k" && (x == 0 || x == this->chip_width()+1)) {
if( (y == 5) || (y == 10) || (y == 15) || (y == 23)) //check ordering here, tile 23-26 might be reversed
return "dsp0";