Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
2585b4af
Commit
2585b4af
authored
Jul 17, 2015
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding synchronization and logger modules
parent
69e5938a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
320 additions
and
260 deletions
+320
-260
mult_saxi_wr.v
axi/mult_saxi_wr.v
+5
-5
x393_parameters.vh
includes/x393_parameters.vh
+44
-26
event_logger.v
logger/event_logger.v
+1
-1
cmd_seq_mux.v
util_modules/cmd_seq_mux.v
+1
-1
x393.v
x393.v
+269
-227
No files found.
axi/mult_saxi_wr.v
View file @
2585b4af
...
@@ -24,9 +24,9 @@
...
@@ -24,9 +24,9 @@
`timescale
1
ns
/
1
ps
`timescale
1
ns
/
1
ps
module
mult_saxi_wr
#(
module
mult_saxi_wr
#(
parameter
MULT_SAXI_ADDR
=
'h
380
,
// need to modify addresses and masks to fit into overall command range
parameter
MULT_SAXI_ADDR
=
'h
730
,
// ..'h737
parameter
MULT_SAXI_CNTRL_ADDR
=
'h
3a0
,
//
parameter
MULT_SAXI_CNTRL_ADDR
=
'h
738
,
// ..'h739
parameter
MULT_SAXI_STATUS_REG
=
'h3
0
,
//
uses 4 consecutive locations
parameter
MULT_SAXI_STATUS_REG
=
'h3
4
,
//..'h37
uses 4 consecutive locations
parameter
MULT_SAXI_HALF_BRAM
=
1
,
// 0 - use full 36Kb BRAM for the buffer, 1 - use just half
parameter
MULT_SAXI_HALF_BRAM
=
1
,
// 0 - use full 36Kb BRAM for the buffer, 1 - use just half
parameter
MULT_SAXI_BSLOG0
=
4
,
// number of bits to represent burst size (4 - b.s. = 16, 0 - b.s = 1)
parameter
MULT_SAXI_BSLOG0
=
4
,
// number of bits to represent burst size (4 - b.s. = 16, 0 - b.s = 1)
parameter
MULT_SAXI_BSLOG1
=
4
,
parameter
MULT_SAXI_BSLOG1
=
4
,
...
@@ -34,7 +34,7 @@ module mult_saxi_wr #(
...
@@ -34,7 +34,7 @@ module mult_saxi_wr #(
parameter
MULT_SAXI_BSLOG3
=
4
,
parameter
MULT_SAXI_BSLOG3
=
4
,
parameter
MULT_SAXI_MASK
=
'h7f8
,
// 4 address/length pairs. In bytes, but lower bits are set to 0?
parameter
MULT_SAXI_MASK
=
'h7f8
,
// 4 address/length pairs. In bytes, but lower bits are set to 0?
parameter
MULT_SAXI_CNTRL_MASK
=
'h7fe
,
// mode and status - 2 locations
parameter
MULT_SAXI_CNTRL_MASK
=
'h7fe
,
// mode and status - 2 locations
parameter
HIS
T_SAXI_AWCACHE
=
4'h3
,
//..7 cache mode (4 bits, default 4'h3)
parameter
MUL
T_SAXI_AWCACHE
=
4'h3
,
//..7 cache mode (4 bits, default 4'h3)
parameter
MULT_SAXI_ADV_WR
=
4
,
// number of clock cycles before end of write to genearte adv_wr_done
parameter
MULT_SAXI_ADV_WR
=
4
,
// number of clock cycles before end of write to genearte adv_wr_done
parameter
MULT_SAXI_ADV_RD
=
3
// number of clock cycles before end of write to genearte adv_wr_done
parameter
MULT_SAXI_ADV_RD
=
3
// number of clock cycles before end of write to genearte adv_wr_done
...
@@ -348,7 +348,7 @@ module mult_saxi_wr #(
...
@@ -348,7 +348,7 @@ module mult_saxi_wr #(
assign
saxi_awlen
=
axi_len
;
assign
saxi_awlen
=
axi_len
;
assign
saxi_awlock
=
2'h0
;
// AXI PS Slave GP0 AWLOCK[1:0], input
assign
saxi_awlock
=
2'h0
;
// AXI PS Slave GP0 AWLOCK[1:0], input
assign
saxi_awcache
=
HIS
T_SAXI_AWCACHE
;
// awcache_mode; // 4'h3; // AXI PS Slave GP0 AWCACHE[3:0], input
assign
saxi_awcache
=
MUL
T_SAXI_AWCACHE
;
// awcache_mode; // 4'h3; // AXI PS Slave GP0 AWCACHE[3:0], input
assign
saxi_awprot
=
3'h0
;
// AXI PS Slave GP0 AWPROT[2:0], input
assign
saxi_awprot
=
3'h0
;
// AXI PS Slave GP0 AWPROT[2:0], input
assign
saxi_awsize
=
2'h2
;
// 4 bytes; AXI PS Slave GP0 AWSIZE[1:0], input
assign
saxi_awsize
=
2'h2
;
// 4 bytes; AXI PS Slave GP0 AWSIZE[1:0], input
assign
saxi_awburst
=
2'h1
;
// Increment address bursts AXI PS Slave GP0 AWBURST[1:0], input
assign
saxi_awburst
=
2'h1
;
// Increment address bursts AXI PS Slave GP0 AWBURST[1:0], input
...
...
includes/x393_parameters.vh
View file @
2585b4af
...
@@ -585,35 +585,53 @@
...
@@ -585,35 +585,53 @@
parameter CMDSEQMUX_ADDR = 'h702, // only status control
parameter CMDSEQMUX_ADDR = 'h702, // only status control
parameter CMDSEQMUX_MASK = 'h7ff,
parameter CMDSEQMUX_MASK = 'h7ff,
parameter CMDSEQMUX_STATUS = 'h3
1
,
parameter CMDSEQMUX_STATUS = 'h3
8
,
// Logger parameters
// Logger parameters
parameter LOGGER_ADDR =
'h720, //..'h721
parameter LOGGER_ADDR = 'h720, //..'h721
parameter LOGGER_STATUS =
'h722, // .. 'h722
parameter LOGGER_STATUS = 'h722, // .. 'h722
parameter LOGGER_STATUS_REG_ADDR =
'h34
, // just 1 location)
parameter LOGGER_STATUS_REG_ADDR =
'h39
, // just 1 location)
parameter LOGGER_MASK =
'h7fe,
parameter LOGGER_MASK = 'h7fe,
parameter LOGGER_STATUS_MASK =
'h7ff,
parameter LOGGER_STATUS_MASK = 'h7ff,
parameter LOGGER_PAGE_IMU =
0, // 'h00..'h1f - overlaps with period/duration/halfperiod/config?
parameter LOGGER_PAGE_IMU = 0, // 'h00..'h1f - overlaps with period/duration/halfperiod/config?
parameter LOGGER_PAGE_GPS =
1, // 'h20..'h3f
parameter LOGGER_PAGE_GPS = 1, // 'h20..'h3f
parameter LOGGER_PAGE_MSG =
2, // 'h40..'h5f
parameter LOGGER_PAGE_MSG = 2, // 'h40..'h5f
parameter LOGGER_PERIOD =
0,
parameter LOGGER_PERIOD = 0,
parameter LOGGER_BIT_DURATION =
1,
parameter LOGGER_BIT_DURATION = 1,
parameter LOGGER_BIT_HALF_PERIOD =
2, //rs232 half bit period
parameter LOGGER_BIT_HALF_PERIOD = 2, //rs232 half bit period
parameter LOGGER_CONFIG =
3,
parameter LOGGER_CONFIG = 3,
parameter LOGGER_CONF_IMU = 2,
parameter LOGGER_CONF_IMU = 2,
parameter LOGGER_CONF_IMU_BITS = 2,
parameter LOGGER_CONF_IMU_BITS = 2,
parameter LOGGER_CONF_GPS = 7,
parameter LOGGER_CONF_GPS = 7,
parameter LOGGER_CONF_GPS_BITS = 4,
parameter LOGGER_CONF_GPS_BITS = 4,
parameter LOGGER_CONF_MSG = 13,
parameter LOGGER_CONF_MSG = 13,
parameter LOGGER_CONF_MSG_BITS = 5,
parameter LOGGER_CONF_MSG_BITS = 5,
parameter LOGGER_CONF_SYN = 18, // 15,
parameter LOGGER_CONF_SYN = 18, // 15,
parameter LOGGER_CONF_SYN_BITS = 4, // 1,
parameter LOGGER_CONF_SYN_BITS = 4, // 1,
parameter LOGGER_CONF_EN = 20, // 17,
parameter LOGGER_CONF_EN = 20, // 17,
parameter LOGGER_CONF_EN_BITS = 1,
parameter LOGGER_CONF_EN_BITS = 1,
parameter LOGGER_CONF_DBG = 25, // 22,
parameter LOGGER_CONF_DBG = 25, // 22,
parameter LOGGER_CONF_DBG_BITS = 4
parameter LOGGER_CONF_DBG_BITS = 4,
parameter MULT_SAXI_HALF_BRAM_IN = 1, // 0 - use full 36Kb BRAM for the buffer, 1 - use just half
parameter MULT_SAXI_WLOG = 4, // number of bits for the input data ( 3 - 8 bit, 4 - 16-bit, 5 - 32-bit
parameter MULT_SAXI_ADDR = 'h730, // ..'h737
parameter MULT_SAXI_CNTRL_ADDR = 'h738, // ..'h739
parameter MULT_SAXI_STATUS_REG = 'h34, //..'h37 uses 4 consecutive locations
parameter MULT_SAXI_HALF_BRAM = 1, // 0 - use full 36Kb BRAM for the buffer, 1 - use just half
parameter MULT_SAXI_BSLOG0 = 4, // number of bits to represent burst size (4 - b.s. = 16, 0 - b.s = 1)
parameter MULT_SAXI_BSLOG1 = 4,
parameter MULT_SAXI_BSLOG2 = 4,
parameter MULT_SAXI_BSLOG3 = 4,
parameter MULT_SAXI_MASK = 'h7f8, // 4 address/length pairs. In bytes, but lower bits are set to 0?
parameter MULT_SAXI_CNTRL_MASK = 'h7fe, // mode and status - 2 locations
parameter MULT_SAXI_AWCACHE = 4'h3, //..7 cache mode (4 bits, default 4'h3)
parameter MULT_SAXI_ADV_WR = 4, // number of clock cycles before end of write to genearte adv_wr_done
parameter MULT_SAXI_ADV_RD = 3 // number of clock cycles before end of write to genearte adv_wr_done
...
...
logger/event_logger.v
View file @
2585b4af
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
module
event_logger
#(
module
event_logger
#(
parameter
LOGGER_ADDR
=
'h720
,
//..'h721
parameter
LOGGER_ADDR
=
'h720
,
//..'h721
parameter
LOGGER_STATUS
=
'h722
,
// .. 'h722
parameter
LOGGER_STATUS
=
'h722
,
// .. 'h722
parameter
LOGGER_STATUS_REG_ADDR
=
'h3
4
,
// just 1 location)
parameter
LOGGER_STATUS_REG_ADDR
=
'h3
9
,
// just 1 location)
parameter
LOGGER_MASK
=
'h7fe
,
parameter
LOGGER_MASK
=
'h7fe
,
parameter
LOGGER_STATUS_MASK
=
'h7ff
,
parameter
LOGGER_STATUS_MASK
=
'h7ff
,
...
...
util_modules/cmd_seq_mux.v
View file @
2585b4af
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
module
cmd_seq_mux
#(
module
cmd_seq_mux
#(
parameter
CMDSEQMUX_ADDR
=
'h702
,
// only status control
parameter
CMDSEQMUX_ADDR
=
'h702
,
// only status control
parameter
CMDSEQMUX_MASK
=
'h7ff
,
parameter
CMDSEQMUX_MASK
=
'h7ff
,
parameter
CMDSEQMUX_STATUS
=
'h3
1
,
parameter
CMDSEQMUX_STATUS
=
'h3
8
,
parameter
AXI_WR_ADDR_BITS
=
14
parameter
AXI_WR_ADDR_BITS
=
14
)(
)(
input
rst
,
// global system reset
input
rst
,
// global system reset
...
...
x393.v
View file @
2585b4af
This diff is collapsed.
Click to expand it.
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