Skip to content

Commit b3d35cc

Browse files
ldoolittcliffordwolf
authored andcommitted
Squelch trailing whitespace
1 parent 607ee66 commit b3d35cc

15 files changed

+19
-22
lines changed

docs/notes_osx.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<h1>Project IceStorm &ndash; Notes for Installing on OSX</h1>
66

77
<p>
8-
The toolchain should be easy to install on OSX platforms. Below are a few troubleshooting items found on Mountain Lion (10.8.2).
8+
The toolchain should be easy to install on OSX platforms. Below are a few troubleshooting items found on Mountain Lion (10.8.2).
99
</p>
1010

1111
<p>

examples/iceblink/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ Note, there are at least two similar looking versions of the iCEblink40 evaluati
55
This example assumes the iCEblink40-HX1K board.
66

77
The iCEblink40 boards have an on-board programmer with USB interface from Digilent.
8-
You need iCEburn to program the FPGA via this interface (or the original vendor
8+
You need iCEburn to program the FPGA via this interface (or the original vendor
99
tools).
1010
https://github.com/davidcarne/iceBurn

icebox/icebox.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ def rlookup_funcnet(self, x, y, netname):
386386
def follow_net(self, netspec):
387387
x, y, netname = netspec
388388
neighbours = self.rlookup_funcnet(x, y, netname)
389-
389+
390390
#print(netspec)
391391
#print('\t', neighbours)
392392

@@ -463,7 +463,7 @@ def follow_net(self, netspec):
463463

464464
if self.tile_has_net(s[0], s[1], s[2]):
465465
neighbours.add((s[0], s[1], s[2]))
466-
466+
467467
#print('\tafter directions', neighbours)
468468
return neighbours
469469

@@ -475,14 +475,14 @@ def group_segments(self, all_from_tiles=set(), extra_connections=list(), extra_s
475475

476476
for seg in extra_segments:
477477
seed_segments.add(seg)
478-
478+
479479
for conn in extra_connections:
480480
s1, s2 = conn
481481
connected_segments.setdefault(s1, set()).add(s2)
482482
connected_segments.setdefault(s2, set()).add(s1)
483483
seed_segments.add(s1)
484484
seed_segments.add(s2)
485-
485+
486486
for idx, tile in self.io_tiles.items():
487487
tc = tileconfig(tile)
488488
pintypes = [ list("000000"), list("000000") ]

icebox/icebox_html.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ def net2cat(netname):
556556
print("Writing %s/index.html.." % outdir, file=stdout)
557557
sys.stdout = open("%s/index.html" % outdir, "w")
558558
print_index()
559-
559+
560560
for x in range(ic.max_x+1):
561561
for y in range(ic.max_y+1):
562562
if (x, y) in mktiles:
@@ -571,7 +571,7 @@ def net2cat(netname):
571571
os.system("icebox_chipdb %s > %s/%s" % ("-8" if mode8k else "", outdir, chipdbfile))
572572

573573
sys.stdout = stdout
574-
574+
575575
elif (tx, ty) == (0, 0):
576576
print_index()
577577

icebox/icebox_vlog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ def get_pll_outsel(pllinfo, name):
592592
text_func.append("// OUT_CLK = %s" % net_oclk)
593593
text_func.append("// LATCH = %s" % net_latch)
594594
text_func.append("// TYPE = %s (LSB:MSB)" % iotype)
595-
595+
596596
if net_din0 != "" or net_din1 != "":
597597
if net_cen == "1":
598598
icen_cond = ""

icecompr/icecompr.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ int main(int argc, char **argv)
298298
value |= 1 << (7-j);
299299
fputc(value, output_file);
300300
}
301-
301+
302302
return 0;
303303
}
304304

icecompr/iceuncompr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static void write_bit(int value)
3737

3838
if (value)
3939
write_buffer |= 1 << write_bitcounter;
40-
40+
4141
if (write_bitcounter == 0) {
4242
fputc(write_buffer, output_file);
4343
write_bitcounter = 8;

icefuzz/fuzzconfig.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
#TODO(tannewt): Add 39, 40, 41 to this list. It causes placement failures for some reason.
7373
gpins = "20 35 37 44".split()
74-
74+
7575
def output_makefile(working_dir, fuzzname):
7676
with open(working_dir + "/Makefile", "w") as f:
7777
print("all: %s" % " ".join(["%s_%02d.bin" % (fuzzname, i) for i in range(num)]), file=f)

icefuzz/make_pll.py

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ def randbin(n):
1111

1212
for p in gpins:
1313
if p in pins: pins.remove(p)
14-
1514

1615
device_class = os.getenv("ICEDEVICE")
1716

icefuzz/pinloc/pinloc-1k-qn84.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ pins="
77
A1 B1 A2 B2 A3 B3 A4 B4 A5 B5 A8 A9 B7 A10 B8 A11 B9 A12
88
A13 B10 B11 A14 B12 A16 B13 B14 A19 B15 A20 B17 A22 A23 B18 B19 A25 A26
99
B20 B21 A27 A29 B22 B23 A31 B24 A32 A33 A34 B26 A35 B27 A38 B29 A39 B30
10-
A40 B31 A41 A43 B32 A44 A45 B34 A46 B35 A47 B36 A48
11-
10+
A40 B31 A41 A43 B32 A44 A45 B34 A46 B35 A47 B36 A48
1211
"
1312

1413
if [ $(echo $pins | wc -w) -ne 67 ]; then

icefuzz/tests/example_icestick.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ module top (
2424

2525
always@(posedge clk)
2626
counter <= counter + 1;
27-
27+
2828
assign {LED1, LED2, LED3, LED4, LED5} = bin2gray(counter >> LOG2DELAY);
2929
endmodule

icefuzz/tests/ioctrl_384.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if line[0] == "IOB_1":
2020
iob = (current_tile[0], current_tile[1], 1)
2121

22-
if ren is None:
22+
if ren is None:
2323
print("(%2d, %2d, %2d, ? , ? , ? )," % (iob[0], iob[1], iob[2]))
2424
else:
2525
print("(%2d, %2d, %2d, %2d, %2d, %2d)," % (iob[0], iob[1], iob[2], ren[0], ren[1], ren[2]))

icefuzz/tests/sb_ram40.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// ICEDEV=hx8k-ct256 bash ../icecube.sh sb_ram40.v
2-
// ../../icebox/icebox_vlog.py -P sb_ram40.psb sb_ram40.txt
3-
// ../../icebox/icebox_explain.py -t '7 21' sb_ram40.txt
2+
// ../../icebox/icebox_vlog.py -P sb_ram40.psb sb_ram40.txt
3+
// ../../icebox/icebox_explain.py -t '7 21' sb_ram40.txt
44

55
module top (
66
input [10:0] WADDR,

icefuzz/timings.py

-1
Original file line numberDiff line numberDiff line change
@@ -435,4 +435,3 @@ def format_entry(entry):
435435
print("<td>%s</td><td>%s</td><td>%s</td>" % tuple(entry[3].split(":")), end="")
436436
print("</tr>")
437437
print("</table>")
438-

iceprog/iceprog.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* iceprog -- simple programming tool for FTDI-based Lattice iCE programmers
33
*
44
* Copyright (C) 2015 Clifford Wolf <[email protected]>
5-
*
5+
*
66
* Permission to use, copy, modify, and/or distribute this software for any
77
* purpose with or without fee is hereby granted, provided that the above
88
* copyright notice and this permission notice appear in all copies.
9-
*
9+
*
1010
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
1111
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
1212
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

0 commit comments

Comments
 (0)