diff --git a/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc b/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc
index e76022bf8f276f3fba816e80ff5046d94634bd0c..35f989b202df80fe44c0fe441d834b7fc82ee34f 100644
--- a/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc
+++ b/applications/unb1_reorder/quartus/sopc_unb1_reorder.sopc
@@ -14,7 +14,7 @@
{
datum baseAddress
{
- value = "720";
+ value = "1104";
type = "long";
}
}
@@ -97,109 +97,109 @@
type = "long";
}
}
- element reg_wdi.mem
+ element ram_diag_data_buffer_im.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "12288";
+ value = "262144";
type = "long";
}
}
- element reg_diag_data_buffer_re.mem
+ element pio_pps.mem
{
datum baseAddress
{
- value = "256";
+ value = "1112";
type = "long";
}
}
- element reg_diag_data_buffer_im.mem
+ element reg_diag_bg.mem
{
datum baseAddress
{
- value = "128";
+ value = "1024";
type = "long";
}
}
- element rom_system_info.mem
+ element ram_diag_data_buffer_re.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "4096";
+ value = "393216";
type = "long";
}
}
- element pio_pps.mem
+ element reg_diag_data_buffer_re.mem
{
datum baseAddress
{
- value = "728";
+ value = "256";
type = "long";
}
}
- element ram_diag_data_buffer_im.mem
+ element reg_unb_sens.mem
{
datum baseAddress
{
- value = "262144";
+ value = "480";
type = "long";
}
}
- element ram_diag_data_buffer_re.mem
+ element reg_bsn_monitor.mem
{
datum baseAddress
{
- value = "393216";
+ value = "512";
type = "long";
}
}
- element reg_diag_bg.mem
+ element rom_system_info.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "640";
+ value = "4096";
type = "long";
}
}
- element reg_bsn_monitor.mem
+ element ram_ss_ss_wide.mem
{
datum baseAddress
{
- value = "384";
+ value = "32768";
type = "long";
}
}
- element reg_unb_sens.mem
+ element reg_wdi.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "608";
+ value = "12288";
type = "long";
}
}
- element ram_ss_ss_wide.mem
+ element ram_diag_bg.mem
{
datum baseAddress
{
- value = "32768";
+ value = "524288";
type = "long";
}
}
- element ram_diag_bg.mem
+ element reg_diag_data_buffer_im.mem
{
datum baseAddress
{
- value = "524288";
+ value = "128";
type = "long";
}
}
@@ -215,7 +215,7 @@
{
datum baseAddress
{
- value = "512";
+ value = "384";
type = "long";
}
}
@@ -286,7 +286,7 @@
}
datum baseAddress
{
- value = "672";
+ value = "1056";
type = "long";
}
}
@@ -378,11 +378,19 @@
type = "int";
}
}
+ element pio_wdi.s1
+ {
+ datum baseAddress
+ {
+ value = "1088";
+ type = "long";
+ }
+ }
element timer_0.s1
{
datum baseAddress
{
- value = "576";
+ value = "448";
type = "long";
}
}
@@ -403,15 +411,7 @@
{
datum baseAddress
{
- value = "688";
- type = "long";
- }
- }
- element pio_wdi.s1
- {
- datum baseAddress
- {
- value = "704";
+ value = "1072";
type = "long";
}
}
@@ -440,8 +440,8 @@
<parameter name="maxAdditionalLatency" value="0" />
<parameter name="projectName" value="unb1_reorder.qpf" />
<parameter name="sopcBorderPoints" value="true" />
- <parameter name="systemHash" value="-42915926488" />
- <parameter name="timeStamp" value="1427107370112" />
+ <parameter name="systemHash" value="-44271126507" />
+ <parameter name="timeStamp" value="1427205044735" />
<parameter name="useTestBenchNamingPattern" value="false" />
<module kind="clock_source" version="11.1" enabled="1" name="clk_0">
<parameter name="clockFrequency" value="25000000" />
@@ -542,7 +542,7 @@
<parameter name="dcache_numTCDM" value="_0" />
<parameter name="dcache_lineSize" value="_32" />
<parameter name="dcache_bursts" value="false" />
- <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer_im.mem' start='0x80' end='0x100' /><slave name='reg_diag_data_buffer_re.mem' start='0x100' end='0x180' /><slave name='reg_bsn_monitor.mem' start='0x180' end='0x200' /><slave name='avs_eth_0.mms_reg' start='0x200' end='0x240' /><slave name='timer_0.s1' start='0x240' end='0x260' /><slave name='reg_unb_sens.mem' start='0x260' end='0x280' /><slave name='reg_diag_bg.mem' start='0x280' end='0x2A0' /><slave name='altpll_0.pll_slave' start='0x2A0' end='0x2B0' /><slave name='pio_debug_wave.s1' start='0x2B0' end='0x2C0' /><slave name='pio_wdi.s1' start='0x2C0' end='0x2D0' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x2D0' end='0x2D8' /><slave name='pio_pps.mem' start='0x2D8' end='0x2E0' /><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='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='avs_eth_0.mms_ram' start='0x4000' end='0x5000' /><slave name='ram_ss_ss_wide.mem' start='0x8000' end='0x10000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='ram_diag_data_buffer_im.mem' start='0x40000' end='0x60000' /><slave name='ram_diag_data_buffer_re.mem' start='0x60000' end='0x80000' /><slave name='ram_diag_bg.mem' start='0x80000' end='0xA0000' /></address-map>]]></parameter>
+ <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_diag_data_buffer_im.mem' start='0x80' end='0x100' /><slave name='reg_diag_data_buffer_re.mem' start='0x100' end='0x180' /><slave name='avs_eth_0.mms_reg' start='0x180' end='0x1C0' /><slave name='timer_0.s1' start='0x1C0' end='0x1E0' /><slave name='reg_unb_sens.mem' start='0x1E0' end='0x200' /><slave name='reg_bsn_monitor.mem' start='0x200' end='0x400' /><slave name='reg_diag_bg.mem' start='0x400' end='0x420' /><slave name='altpll_0.pll_slave' start='0x420' end='0x430' /><slave name='pio_debug_wave.s1' start='0x430' end='0x440' /><slave name='pio_wdi.s1' start='0x440' end='0x450' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x450' end='0x458' /><slave name='pio_pps.mem' start='0x458' end='0x460' /><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='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='avs_eth_0.mms_ram' start='0x4000' end='0x5000' /><slave name='ram_ss_ss_wide.mem' start='0x8000' end='0x10000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='ram_diag_data_buffer_im.mem' start='0x40000' end='0x60000' /><slave name='ram_diag_data_buffer_re.mem' start='0x60000' end='0x80000' /><slave name='ram_diag_bg.mem' start='0x80000' end='0xA0000' /></address-map>]]></parameter>
<parameter name="dataAddrWidth" value="20" />
<parameter name="customInstSlavesSystemInfo" value="<info/>" />
<parameter name="cpuReset" value="false" />
@@ -882,7 +882,7 @@ q]]></parameter>
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
<module kind="avs_common_mm" version="1.0" enabled="1" name="reg_bsn_monitor">
- <parameter name="g_adr_w" value="5" />
+ <parameter name="g_adr_w" value="7" />
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="50000000" />
</module>
@@ -927,7 +927,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="jtag_uart_0.avalon_jtag_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x02d0" />
+ <parameter name="baseAddress" value="0x0450" />
</connection>
<connection
kind="interrupt"
@@ -942,7 +942,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="altpll_0.pll_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x02a0" />
+ <parameter name="baseAddress" value="0x0420" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="cpu_0.clk" />
<connection
@@ -967,7 +967,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_debug_wave.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x02b0" />
+ <parameter name="baseAddress" value="0x0430" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="pio_wdi.clk" />
<connection
@@ -976,7 +976,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_wdi.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x02c0" />
+ <parameter name="baseAddress" value="0x0440" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="timer_0.clk" />
<connection
@@ -985,7 +985,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="timer_0.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0240" />
+ <parameter name="baseAddress" value="0x01c0" />
</connection>
<connection kind="interrupt" version="11.1" start="cpu_0.d_irq" end="timer_0.irq">
<parameter name="irqNumber" value="1" />
@@ -1001,7 +1001,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_unb_sens.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0260" />
+ <parameter name="baseAddress" value="0x01e0" />
</connection>
<connection
kind="clock"
@@ -1036,7 +1036,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_pps.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x02d8" />
+ <parameter name="baseAddress" value="0x0458" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="reg_wdi.system" />
<connection
@@ -1058,7 +1058,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_diag_bg.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0280" />
+ <parameter name="baseAddress" value="0x0400" />
</connection>
<connection
kind="clock"
@@ -1149,7 +1149,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_bsn_monitor.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0180" />
+ <parameter name="baseAddress" value="0x0200" />
</connection>
<connection kind="clock" version="11.1" start="altpll_0.c0" end="avs_eth_0.mm" />
<connection
@@ -1166,7 +1166,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="avs_eth_0.mms_reg">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0200" />
+ <parameter name="baseAddress" value="0x0180" />
</connection>
<connection
kind="avalon"