Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tapasco
tapasco
Commits
e3a6000c
Commit
e3a6000c
authored
Oct 11, 2017
by
Jens Korinth
Browse files
Mux: remove reset logic
parent
d8e4d2c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/scala/axi4/Mux.scala
View file @
e3a6000c
...
...
@@ -24,8 +24,8 @@ class AxiMux(n: Int)(implicit axi: Configuration) extends Module {
// states of the FSM
val
waiting
::
in_burst
::
Nil
=
Enum
(
2
)
val
r_curr
=
Reg
(
UInt
(
log2Ceil
(
n
).
W
))
val
w_curr
=
Reg
(
UInt
(
log2Ceil
(
n
).
W
))
val
r_curr
=
Reg
Init
(
UInt
(
log2Ceil
(
n
).
W
)
,
0.
U
)
val
w_curr
=
Reg
Init
(
UInt
(
log2Ceil
(
n
).
W
)
,
0.
U
)
val
r_state
=
RegInit
(
waiting
)
val
w_state
=
RegInit
(
waiting
)
...
...
@@ -69,31 +69,25 @@ class AxiMux(n: Int)(implicit axi: Configuration) extends Module {
io
.
maxi
.
writeData
.
valid
:=
io
.
saxi
(
w_curr
).
writeData
.
valid
io
.
maxi
.
writeData
.
bits
:=
io
.
saxi
(
w_curr
).
writeData
.
bits
when
(
r
eset
)
{
r_curr
:=
0.
U
w_curr
:=
0.
U
when
(
r
_state
===
waiting
)
{
when
(
io
.
saxi
(
r_curr
).
readAddr
.
valid
)
{
r_state
:=
in_burst
}
.
otherwise
{
next_r
()
}
}
.
otherwise
{
when
(
r_state
===
waiting
)
{
when
(
io
.
saxi
(
r_curr
).
readAddr
.
valid
)
{
r_state
:=
in_burst
}
.
otherwise
{
next_r
()
}
}
.
otherwise
{
when
(
io
.
saxi
(
r_curr
).
readData
.
bits
.
last
)
{
next_r
()
r_state
:=
waiting
}
when
(
io
.
saxi
(
r_curr
).
readData
.
bits
.
last
)
{
next_r
()
r_state
:=
waiting
}
}
when
(
w_state
===
waiting
)
{
when
(
io
.
saxi
(
w_curr
).
writeAddr
.
valid
)
{
w_state
:=
in_burst
}
.
otherwise
{
next_w
()
}
}
.
otherwise
{
when
(
io
.
saxi
(
w_curr
).
writeData
.
bits
.
last
)
{
next_w
()
w_state
:=
waiting
}
when
(
w_state
===
waiting
)
{
when
(
io
.
saxi
(
w_curr
).
writeAddr
.
valid
)
{
w_state
:=
in_burst
}
.
otherwise
{
next_w
()
}
}
.
otherwise
{
when
(
io
.
saxi
(
w_curr
).
writeData
.
bits
.
last
)
{
next_w
()
w_state
:=
waiting
}
}
}
Jens Korinth
@jk
mentioned in commit
17f0d672
·
Mar 05, 2018
mentioned in commit
17f0d672
mentioned in commit 17f0d67240ebf5d7e1d0be9162d272b04256c47d
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment