projects
/
gram.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5eb4556
)
Fix typos
author
Jean THOMAS
<git0@pub.jeanthomas.me>
Wed, 10 Jun 2020 08:28:07 +0000
(10:28 +0200)
committer
Jean THOMAS
<git0@pub.jeanthomas.me>
Wed, 10 Jun 2020 08:28:07 +0000
(10:28 +0200)
gram/frontend/wishbone.py
patch
|
blob
|
history
diff --git
a/gram/frontend/wishbone.py
b/gram/frontend/wishbone.py
index 6f39dac31b59549805e307266fb97512175b2983..59dfe41e27ba676331353009284ea89161636258 100644
(file)
--- a/
gram/frontend/wishbone.py
+++ b/
gram/frontend/wishbone.py
@@
-30,25
+30,25
@@
class gramWishbone(Peripheral, Elaboratable):
# Write datapath
m.d.comb += [
# Write datapath
m.d.comb += [
- self._port.wdata.valid.eq(
wishbone.cyc & wishbone.stb & wishbone
.we),
- self._port.wdata.data.eq(
wishbone
.dat_w),
- self._port.wdata.we.eq(
wishbone
.sel),
+ self._port.wdata.valid.eq(
self.bus.cyc & self.bus.stb & self.bus
.we),
+ self._port.wdata.data.eq(
self.bus
.dat_w),
+ self._port.wdata.we.eq(
self.bus
.sel),
]
# Read datapath
m.d.comb += [
]
# Read datapath
m.d.comb += [
- self.bus.dat_r.eq(self._port.rdata
.data
),
- self._port.rdata.
data.
ready.eq(1),
+ self.bus.dat_r.eq(self._port.rdata),
+ self._port.rdata.ready.eq(1),
]
with m.FSM():
with m.State("Send-Cmd"):
m.d.comb += [
]
with m.FSM():
with m.State("Send-Cmd"):
m.d.comb += [
- port.cmd.valid.eq(self.bus.cyc & self.bus.stb),
- port.cmd.we.eq(self.bus.we),
- port.cmd.addr.eq(self.bus.adr),
+
self._
port.cmd.valid.eq(self.bus.cyc & self.bus.stb),
+
self._
port.cmd.we.eq(self.bus.we),
+
self._
port.cmd.addr.eq(self.bus.adr),
]
]
- with m.If(
port.cmd.valid &
port.cmd.ready):
+ with m.If(
self._port.cmd.valid & self._
port.cmd.ready):
with m.If(self.bus.we):
m.next = "Wait-Write"
with m.Else():
with m.If(self.bus.we):
m.next = "Wait-Write"
with m.Else():