diff --git a/applications/apertif/designs/apertif_unb1_correlator/quartus/qsys_apertif_unb1_correlator.qsys b/applications/apertif/designs/apertif_unb1_correlator/quartus/qsys_apertif_unb1_correlator.qsys
index 2406dfd90c3bb4d2811fc00083ebffa12915a3f6..f92ff09d5178d57127c880ed242568feda93088e 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/quartus/qsys_apertif_unb1_correlator.qsys
+++ b/applications/apertif/designs/apertif_unb1_correlator/quartus/qsys_apertif_unb1_correlator.qsys
@@ -24,7 +24,7 @@
{
datum baseAddress
{
- value = "1680";
+ value = "1712";
type = "long";
}
}
@@ -133,23 +133,23 @@
type = "boolean";
}
}
- element ram_fil_coefs.mem
+ element reg_unb_sens.mem
{
datum baseAddress
{
- value = "14336";
+ value = "1600";
type = "long";
}
}
- element reg_mdio_2.mem
+ element reg_diag_bg.mem
{
datum baseAddress
{
- value = "1536";
+ value = "1632";
type = "long";
}
}
- element pio_system_info.mem
+ element reg_wdi.mem
{
datum _lockedAddress
{
@@ -158,36 +158,31 @@
}
datum baseAddress
{
- value = "0";
+ value = "12288";
type = "long";
}
}
- element reg_wdi.mem
+ element reg_bsn_monitor.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "12288";
+ value = "1024";
type = "long";
}
}
- element pio_pps.mem
+ element ram_diag_data_buf.mem
{
datum baseAddress
{
- value = "1696";
+ value = "524288";
type = "long";
}
}
- element reg_tr_xaui.mem
+ element reg_mdio_0.mem
{
datum baseAddress
{
- value = "16384";
+ value = "1568";
type = "long";
}
}
@@ -199,40 +194,40 @@
type = "long";
}
}
- element reg_bsn_monitor.mem
+ element reg_diag_data_buf.mem
{
datum baseAddress
{
- value = "1024";
+ value = "1720";
type = "long";
}
}
- element reg_mdio_0.mem
+ element reg_tr_10GbE.mem
{
+ datum _tags
+ {
+ value = "";
+ type = "String";
+ }
datum baseAddress
{
- value = "1568";
+ value = "262144";
type = "long";
}
}
- element ram_diag_data_buf.mem
+ element reg_tr_xaui.mem
{
datum baseAddress
{
- value = "524288";
+ value = "16384";
type = "long";
}
}
- element rom_system_info.mem
+ element reg_mdio_2.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "4096";
+ value = "1536";
type = "long";
}
}
@@ -244,40 +239,53 @@
type = "long";
}
}
- element reg_tr_10GbE.mem
+ element pio_system_info.mem
{
- datum _tags
+ datum _lockedAddress
{
- value = "";
- type = "String";
+ value = "1";
+ type = "boolean";
}
datum baseAddress
{
- value = "262144";
+ value = "0";
type = "long";
}
}
- element reg_dp_offload_rx_hdr_dat.mem
+ element pio_pps.mem
{
datum baseAddress
{
- value = "512";
+ value = "1728";
type = "long";
}
}
- element reg_unb_sens.mem
+ element rom_system_info.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "1600";
+ value = "4096";
type = "long";
}
}
- element reg_diag_data_buf.mem
+ element reg_dp_offload_rx_hdr_dat.mem
+ {
+ datum baseAddress
+ {
+ value = "512";
+ type = "long";
+ }
+ }
+ element ram_fil_coefs.mem
{
datum baseAddress
{
- value = "1688";
+ value = "14336";
type = "long";
}
}
@@ -384,7 +392,7 @@
{
datum baseAddress
{
- value = "1664";
+ value = "1696";
type = "long";
}
}
@@ -422,7 +430,7 @@
type = "String";
}
}
- element reg_diag_data_buf.read
+ element reg_bsn_monitor.read
{
datum _tags
{
@@ -430,7 +438,7 @@
type = "String";
}
}
- element reg_bsn_monitor.read
+ element reg_diag_data_buf.read
{
datum _tags
{
@@ -586,7 +594,15 @@
{
datum baseAddress
{
- value = "1648";
+ value = "1680";
+ type = "long";
+ }
+ }
+ element timer_0.s1
+ {
+ datum baseAddress
+ {
+ value = "192";
type = "long";
}
}
@@ -607,15 +623,7 @@
{
datum baseAddress
{
- value = "1632";
- type = "long";
- }
- }
- element timer_0.s1
- {
- datum baseAddress
- {
- value = "192";
+ value = "1664";
type = "long";
}
}
@@ -671,7 +679,7 @@
<parameter name="projectName">apertif_unb1_correlator.qpf</parameter>
<parameter name="sopcBorderPoints" value="false" />
<parameter name="systemHash" value="1" />
- <parameter name="timeStamp" value="1429171641244" />
+ <parameter name="timeStamp" value="1429252295516" />
<parameter name="useTestBenchNamingPattern" value="false" />
<instanceScript></instanceScript>
<interface name="mm_clk" internal="export_mm.out_clk" type="clock" dir="start">
@@ -1567,7 +1575,7 @@ q]]></parameter>
<parameter name="tightlyCoupledInstructionMaster2AddrWidth" value="1" />
<parameter name="tightlyCoupledInstructionMaster3AddrWidth" value="1" />
<parameter name="instSlaveMapParam"><![CDATA[<address-map><slave name='cpu_0.jtag_debug_module' start='0x7000' end='0x7800' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /></address-map>]]></parameter>
- <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='avs_eth_0.mms_reg' start='0x80' end='0xC0' /><slave name='timer_0.s1' start='0xC0' end='0xE0' /><slave name='reg_mdio_1.mem' start='0xE0' end='0x100' /><slave name='reg_dp_offload_tx_hdr_dat.mem' start='0x100' end='0x200' /><slave name='reg_dp_offload_rx_hdr_dat.mem' start='0x200' end='0x400' /><slave name='reg_bsn_monitor.mem' start='0x400' end='0x600' /><slave name='reg_mdio_2.mem' start='0x600' end='0x620' /><slave name='reg_mdio_0.mem' start='0x620' end='0x640' /><slave name='reg_unb_sens.mem' start='0x640' end='0x660' /><slave name='pio_debug_wave.s1' start='0x660' end='0x670' /><slave name='pio_wdi.s1' start='0x670' end='0x680' /><slave name='altpll_0.pll_slave' start='0x680' end='0x690' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x690' end='0x698' /><slave name='reg_diag_data_buf.mem' start='0x698' end='0x6A0' /><slave name='pio_pps.mem' start='0x6A0' end='0x6A8' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='ram_fil_coefs.mem' start='0x3800' end='0x4000' /><slave name='reg_tr_xaui.mem' start='0x4000' end='0x6000' /><slave name='avs_eth_0.mms_ram' start='0x6000' end='0x7000' /><slave name='cpu_0.jtag_debug_module' start='0x7000' end='0x7800' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='reg_tr_10GbE.mem' start='0x40000' end='0x60000' /><slave name='ram_diag_data_buf.mem' start='0x80000' end='0x100000' /></address-map>]]></parameter>
+ <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='avs_eth_0.mms_reg' start='0x80' end='0xC0' /><slave name='timer_0.s1' start='0xC0' end='0xE0' /><slave name='reg_mdio_1.mem' start='0xE0' end='0x100' /><slave name='reg_dp_offload_tx_hdr_dat.mem' start='0x100' end='0x200' /><slave name='reg_dp_offload_rx_hdr_dat.mem' start='0x200' end='0x400' /><slave name='reg_bsn_monitor.mem' start='0x400' end='0x600' /><slave name='reg_mdio_2.mem' start='0x600' end='0x620' /><slave name='reg_mdio_0.mem' start='0x620' end='0x640' /><slave name='reg_unb_sens.mem' start='0x640' end='0x660' /><slave name='reg_diag_bg.mem' start='0x660' end='0x680' /><slave name='pio_debug_wave.s1' start='0x680' end='0x690' /><slave name='pio_wdi.s1' start='0x690' end='0x6A0' /><slave name='altpll_0.pll_slave' start='0x6A0' end='0x6B0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x6B0' end='0x6B8' /><slave name='reg_diag_data_buf.mem' start='0x6B8' end='0x6C0' /><slave name='pio_pps.mem' start='0x6C0' end='0x6C8' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='ram_fil_coefs.mem' start='0x3800' end='0x4000' /><slave name='reg_tr_xaui.mem' start='0x4000' end='0x6000' /><slave name='avs_eth_0.mms_ram' start='0x6000' end='0x7000' /><slave name='cpu_0.jtag_debug_module' start='0x7000' end='0x7800' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='reg_tr_10GbE.mem' start='0x40000' end='0x60000' /><slave name='ram_diag_data_buf.mem' start='0x80000' end='0x100000' /></address-map>]]></parameter>
<parameter name="clockFrequency" value="50000000" />
<parameter name="deviceFamilyName" value="Stratix IV" />
<parameter name="internalIrqMaskSystemInfo" value="7" />
@@ -1914,7 +1922,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="jtag_uart_0.avalon_jtag_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0690" />
+ <parameter name="baseAddress" value="0x06b0" />
</connection>
<connection
kind="interrupt"
@@ -1929,7 +1937,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_debug_wave.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0660" />
+ <parameter name="baseAddress" value="0x0680" />
</connection>
<connection
kind="avalon"
@@ -1937,7 +1945,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_wdi.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0670" />
+ <parameter name="baseAddress" value="0x0690" />
</connection>
<connection
kind="avalon"
@@ -2004,7 +2012,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_diag_data_buf.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0698" />
+ <parameter name="baseAddress" value="0x06b8" />
</connection>
<connection
kind="reset"
@@ -2132,7 +2140,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_pps.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x06a0" />
+ <parameter name="baseAddress" value="0x06c0" />
</connection>
<connection
kind="reset"
@@ -2173,7 +2181,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="altpll_0.pll_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0680" />
+ <parameter name="baseAddress" value="0x06a0" />
</connection>
<connection
kind="reset"
@@ -2464,4 +2472,12 @@ q]]></parameter>
version="11.1"
start="altpll_0.c0"
end="reg_diag_bg.system" />
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="reg_diag_bg.mem">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x0660" />
+ </connection>
</system>