projects
/
nmigen-soc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32d5b5d
)
whitespace error somehow
author
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Sat, 20 Jun 2020 00:02:29 +0000
(
01:02
+0100)
committer
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Sat, 20 Jun 2020 00:02:29 +0000
(
01:02
+0100)
nmigen_soc/wishbone/bus.py
patch
|
blob
|
history
diff --git
a/nmigen_soc/wishbone/bus.py
b/nmigen_soc/wishbone/bus.py
index ad6d2d3332c55c193c4a9aec390545c9b99e646f..2d9296c1689292cef6d0bdcbc0db693a72a74bbd 100644
(file)
--- a/
nmigen_soc/wishbone/bus.py
+++ b/
nmigen_soc/wishbone/bus.py
@@
-256,7
+256,7
@@
class Decoder(Elaboratable):
"""
if not isinstance(sub_bus, Interface):
raise TypeError("Subordinate bus must be an instance of "
"""
if not isinstance(sub_bus, Interface):
raise TypeError("Subordinate bus must be an instance of "
- "wishbone.Interface, not {!r}"
.format(sub_bus))
+ "wishbone.Interface, not {!r}".format(sub_bus))
if sub_bus.granularity > self.bus.granularity:
raise ValueError("Subordinate bus has granularity {}, "
"which is greater than the "
if sub_bus.granularity > self.bus.granularity:
raise ValueError("Subordinate bus has granularity {}, "
"which is greater than the "
@@
-264,10
+264,10
@@
class Decoder(Elaboratable):
.format(sub_bus.granularity, self.bus.granularity))
if not sparse:
if sub_bus.data_width != self.bus.data_width:
.format(sub_bus.granularity, self.bus.granularity))
if not sparse:
if sub_bus.data_width != self.bus.data_width:
- raise ValueError("Subordinate bus has data width {},
"
- "which is not the same as "
- "decoder data width {} "
-
"(required
for dense address translation)"
+ raise ValueError("Subordinate bus has data width {}, "
+
"which is not the same as "
+ "decoder data width {}
(required
"
+
"
for dense address translation)"
.format(sub_bus.data_width,
self.bus.data_width))
else:
.format(sub_bus.data_width,
self.bus.data_width))
else:
@@
-282,8
+282,8
@@
class Decoder(Elaboratable):
for opt_output in {"err", "rty", "stall"}:
if hasattr(sub_bus, opt_output) and not hasattr(
self.bus, opt_output):
for opt_output in {"err", "rty", "stall"}:
if hasattr(sub_bus, opt_output) and not hasattr(
self.bus, opt_output):
- raise ValueError("Subordinate bus has optional output "
- "
{!r},
but the decoder "
+ raise ValueError("Subordinate bus has optional output
{!r},
"
+ "but the decoder "
"does not have a corresponding input"
.format(opt_output))
"does not have a corresponding input"
.format(opt_output))