Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
E
euro-adc-65m-14b-40cha-gw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
eurocard
euro-adc-65m-14b-40cha
euro-adc-65m-14b-40cha-gw
Commits
ae11f0c4
Commit
ae11f0c4
authored
Aug 23, 2017
by
Dave Newbold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Decoder update
parent
167769b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
ipbus_decode_sc_trig.vhd
components/solid/firmware/hdl/ipbus_decode_sc_trig.vhd
+4
-4
sc_rtrig.vhd
components/solid/firmware/hdl/sc_rtrig.vhd
+3
-2
No files found.
components/solid/firmware/hdl/ipbus_decode_sc_trig.vhd
View file @
ae11f0c4
...
...
@@ -17,13 +17,13 @@ package ipbus_decode_sc_trig is
subtype
ipbus_sel_t
is
std_logic_vector
(
IPBUS_SEL_WIDTH
-
1
downto
0
);
function
ipbus_sel_sc_trig
(
addr
:
in
std_logic_vector
(
31
downto
0
))
return
ipbus_sel_t
;
-- START automatically generated VHDL the
Fri Jul 14 14:14:53
2017
-- START automatically generated VHDL the
Wed Aug 23 15:54:14
2017
constant
N_SLV_CSR
:
integer
:
=
0
;
constant
N_SLV_LOC_MASK
:
integer
:
=
1
;
constant
N_SLV_ZS_CFG
:
integer
:
=
2
;
constant
N_SLV_DTMON
:
integer
:
=
3
;
constant
N_SLV_SEQ
:
integer
:
=
4
;
constant
N_SLV_
CHAN_MASK
:
integer
:
=
5
;
constant
N_SLV_
MASKS
:
integer
:
=
5
;
constant
N_SLAVES
:
integer
:
=
6
;
-- END automatically generated VHDL
...
...
@@ -36,7 +36,7 @@ package body ipbus_decode_sc_trig is
variable
sel
:
ipbus_sel_t
;
begin
-- START automatically generated VHDL the
Fri Jul 14 14:14:53
2017
-- START automatically generated VHDL the
Wed Aug 23 15:54:14
2017
if
std_match
(
addr
,
"---------------------------000--"
)
then
sel
:
=
ipbus_sel_t
(
to_unsigned
(
N_SLV_CSR
,
IPBUS_SEL_WIDTH
));
-- csr / base 0x00000000 / mask 0x0000001c
elsif
std_match
(
addr
,
"---------------------------00100"
)
then
...
...
@@ -48,7 +48,7 @@ package body ipbus_decode_sc_trig is
elsif
std_match
(
addr
,
"---------------------------01---"
)
then
sel
:
=
ipbus_sel_t
(
to_unsigned
(
N_SLV_SEQ
,
IPBUS_SEL_WIDTH
));
-- seq / base 0x00000008 / mask 0x00000018
elsif
std_match
(
addr
,
"---------------------------1----"
)
then
sel
:
=
ipbus_sel_t
(
to_unsigned
(
N_SLV_
CHAN_MASK
,
IPBUS_SEL_WIDTH
));
-- chan_mask
/ base 0x00000010 / mask 0x00000010
sel
:
=
ipbus_sel_t
(
to_unsigned
(
N_SLV_
MASKS
,
IPBUS_SEL_WIDTH
));
-- masks
/ base 0x00000010 / mask 0x00000010
-- END automatically generated VHDL
else
...
...
components/solid/firmware/hdl/sc_rtrig.vhd
View file @
ae11f0c4
...
...
@@ -6,6 +6,7 @@
library
IEEE
;
use
IEEE
.
STD_LOGIC_1164
.
ALL
;
use
ieee
.
numeric_std
.
all
;
use
ieee
.
std_logic_misc
.
all
;
use
work
.
ipbus
.
all
;
...
...
@@ -38,9 +39,9 @@ architecture rtl of sc_rtrig is
begin
mask
:
entity
work
.
ipbus_reg_v
reg
:
entity
work
.
ipbus_reg_v
generic
map
(
N_REG
=>
N_CHAN_TRG
*
2
N_REG
=>
1
)
port
map
(
clk
=>
clk
,
...
...
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