adding synchronization and logger modules (2585b4af) · Commits · Elphel / x393

axi/mult_saxi_wr.v

+5 −5

Original line number	Diff line number	Diff line
		@@ -24,9 +24,9 @@
		`timescale 1ns/1ps

		module mult_saxi_wr #(
		parameter MULT_SAXI_ADDR = 'h380, // need to modify addresses and masks to fit into overall command range
		parameter MULT_SAXI_CNTRL_ADDR = 'h3a0, //
		parameter MULT_SAXI_STATUS_REG = 'h30, // uses 4 consecutive locations
		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,
		@@ -34,7 +34,7 @@ module mult_saxi_wr #(
		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 HIST_SAXI_AWCACHE = 4'h3, //..7 cache mode (4 bits, default 4'h3)
		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

		@@ -348,7 +348,7 @@ module mult_saxi_wr #(
		assign saxi_awlen = axi_len;

		assign saxi_awlock= 2'h0; // AXI PS Slave GP0 AWLOCK[1:0], input
		assign saxi_awcache= HIST_SAXI_AWCACHE; // awcache_mode; // 4'h3; // AXI PS Slave GP0 AWCACHE[3:0], input
		assign saxi_awcache= MULT_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_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

includes/x393_parameters.vh

+44 −26

Original line number	Diff line number	Diff line
		@@ -585,11 +585,11 @@

		parameter CMDSEQMUX_ADDR = 'h702, // only status control
		parameter CMDSEQMUX_MASK = 'h7ff,
		parameter CMDSEQMUX_STATUS = 'h31,
		parameter CMDSEQMUX_STATUS = 'h38,
		// Logger parameters
		parameter LOGGER_ADDR = 'h720, //..'h721
		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_STATUS_MASK = 'h7ff,

		@@ -613,7 +613,25 @@
		parameter LOGGER_CONF_EN = 20, // 17,
		parameter LOGGER_CONF_EN_BITS = 1,
		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

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		module event_logger#(
		parameter LOGGER_ADDR = 'h720, //..'h721
		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_STATUS_MASK = 'h7ff,

util_modules/cmd_seq_mux.v

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		module cmd_seq_mux#(
		parameter CMDSEQMUX_ADDR = 'h702, // only status control
		parameter CMDSEQMUX_MASK = 'h7ff,
		parameter CMDSEQMUX_STATUS = 'h31,
		parameter CMDSEQMUX_STATUS = 'h38,
		parameter AXI_WR_ADDR_BITS=14
		)(
		input rst, // global system reset

Admin message