From db8ed8bf6b8b1aac9230e1e40f29c1fda35f8c9e Mon Sep 17 00:00:00 2001
From: Pepping <pepping>
Date: Fri, 31 Jul 2015 09:39:34 +0000
Subject: [PATCH] Updated for smaller datbuffers and bsnmonitor
---
.../qsys_apertif_unb1_cor_mesh_ref.qsys | 192 ++++++++++++------
1 file changed, 133 insertions(+), 59 deletions(-)
diff --git a/applications/apertif/designs/apertif_unb1_cor_mesh_ref/quartus/qsys_apertif_unb1_cor_mesh_ref.qsys b/applications/apertif/designs/apertif_unb1_cor_mesh_ref/quartus/qsys_apertif_unb1_cor_mesh_ref.qsys
index f9ea83403c..26858bd749 100644
--- a/applications/apertif/designs/apertif_unb1_cor_mesh_ref/quartus/qsys_apertif_unb1_cor_mesh_ref.qsys
+++ b/applications/apertif/designs/apertif_unb1_cor_mesh_ref/quartus/qsys_apertif_unb1_cor_mesh_ref.qsys
@@ -16,7 +16,7 @@
{
datum baseAddress
{
- value = "640";
+ value = "1280";
type = "long";
}
}
@@ -85,23 +85,31 @@
type = "boolean";
}
}
- element pio_pps.mem
+ element ram_diag_data_buf_im.mem
{
datum baseAddress
{
- value = "656";
+ value = "768";
type = "long";
}
}
- element reg_tr_nonbonded.mem
+ element reg_diag_data_buf_re.mem
{
datum baseAddress
{
- value = "192";
+ value = "1288";
type = "long";
}
}
- element reg_wdi.mem
+ element ram_diag_data_buf_re.mem
+ {
+ datum baseAddress
+ {
+ value = "512";
+ type = "long";
+ }
+ }
+ element pio_system_info.mem
{
datum _lockedAddress
{
@@ -110,48 +118,43 @@
}
datum baseAddress
{
- value = "12288";
+ value = "0";
type = "long";
}
}
- element reg_diagnostics.mem
+ element pio_pps.mem
{
datum baseAddress
{
- value = "256";
+ value = "1296";
type = "long";
}
}
- element reg_diag_data_buf_im.mem
+ element reg_bsn_monitor.mem
{
datum baseAddress
{
- value = "664";
+ value = "128";
type = "long";
}
}
- element pio_system_info.mem
+ element reg_tr_nonbonded.mem
{
- datum _lockedAddress
- {
- value = "1";
- type = "boolean";
- }
datum baseAddress
{
- value = "0";
+ value = "1088";
type = "long";
}
}
- element reg_diag_data_buf_re.mem
+ element reg_diagnostics.mem
{
datum baseAddress
{
- value = "648";
+ value = "256";
type = "long";
}
}
- element rom_system_info.mem
+ element reg_wdi.mem
{
datum _lockedAddress
{
@@ -160,15 +163,20 @@
}
datum baseAddress
{
- value = "4096";
+ value = "12288";
type = "long";
}
}
- element ram_diag_data_buf_im.mem
+ element rom_system_info.mem
{
+ datum _lockedAddress
+ {
+ value = "1";
+ type = "boolean";
+ }
datum baseAddress
{
- value = "28672";
+ value = "4096";
type = "long";
}
}
@@ -176,23 +184,23 @@
{
datum baseAddress
{
- value = "544";
+ value = "1184";
type = "long";
}
}
- element ram_diag_data_buf_re.mem
+ element ram_diag_bg.mem
{
datum baseAddress
{
- value = "24576";
+ value = "20480";
type = "long";
}
}
- element ram_diag_bg.mem
+ element reg_diag_data_buf_im.mem
{
datum baseAddress
{
- value = "20480";
+ value = "1304";
type = "long";
}
}
@@ -200,7 +208,7 @@
{
datum baseAddress
{
- value = "576";
+ value = "1216";
type = "long";
}
}
@@ -216,7 +224,7 @@
{
datum baseAddress
{
- value = "128";
+ value = "1024";
type = "long";
}
}
@@ -348,6 +356,14 @@
type = "String";
}
}
+ element reg_bsn_monitor
+ {
+ datum _sortIndex
+ {
+ value = "21";
+ type = "int";
+ }
+ }
element reg_diag_bg
{
datum _sortIndex
@@ -451,7 +467,15 @@
{
datum baseAddress
{
- value = "608";
+ value = "1248";
+ type = "long";
+ }
+ }
+ element timer_0.s1
+ {
+ datum baseAddress
+ {
+ value = "1152";
type = "long";
}
}
@@ -468,19 +492,11 @@
type = "long";
}
}
- element timer_0.s1
- {
- datum baseAddress
- {
- value = "512";
- type = "long";
- }
- }
element pio_wdi.s1
{
datum baseAddress
{
- value = "624";
+ value = "1264";
type = "long";
}
}
@@ -533,10 +549,10 @@
<parameter name="globalResetBus" value="false" />
<parameter name="hdlLanguage" value="VHDL" />
<parameter name="maxAdditionalLatency" value="0" />
- <parameter name="projectName">apertif_unb1_cor_mesh_ref.qpf</parameter>
+ <parameter name="projectName" value="" />
<parameter name="sopcBorderPoints" value="false" />
<parameter name="systemHash" value="1" />
- <parameter name="timeStamp" value="1434382179425" />
+ <parameter name="timeStamp" value="1437647770807" />
<parameter name="useTestBenchNamingPattern" value="false" />
<instanceScript></instanceScript>
<interface
@@ -1085,6 +1101,41 @@
internal="ram_diag_data_buf_re.reset"
type="conduit"
dir="end" />
+ <interface
+ name="reg_bsn_monitor_reset"
+ internal="reg_bsn_monitor.reset"
+ type="conduit"
+ dir="end" />
+ <interface
+ name="reg_bsn_monitor_clk"
+ internal="reg_bsn_monitor.clk"
+ type="conduit"
+ dir="end" />
+ <interface
+ name="reg_bsn_monitor_address"
+ internal="reg_bsn_monitor.address"
+ type="conduit"
+ dir="end" />
+ <interface
+ name="reg_bsn_monitor_write"
+ internal="reg_bsn_monitor.write"
+ type="conduit"
+ dir="end" />
+ <interface
+ name="reg_bsn_monitor_writedata"
+ internal="reg_bsn_monitor.writedata"
+ type="conduit"
+ dir="end" />
+ <interface
+ name="reg_bsn_monitor_read"
+ internal="reg_bsn_monitor.read"
+ type="conduit"
+ dir="end" />
+ <interface
+ name="reg_bsn_monitor_readdata"
+ internal="reg_bsn_monitor.readdata"
+ type="conduit"
+ dir="end" />
<module
kind="altera_avalon_onchip_memory2"
version="11.1"
@@ -1261,7 +1312,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='0x3800' end='0x4000' /><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='reg_tr_nonbonded.mem' start='0xC0' end='0x100' /><slave name='reg_diagnostics.mem' start='0x100' end='0x200' /><slave name='timer_0.s1' start='0x200' end='0x220' /><slave name='reg_unb_sens.mem' start='0x220' end='0x240' /><slave name='reg_diag_bg.mem' start='0x240' end='0x260' /><slave name='pio_debug_wave.s1' start='0x260' end='0x270' /><slave name='pio_wdi.s1' start='0x270' end='0x280' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x280' end='0x288' /><slave name='reg_diag_data_buf_re.mem' start='0x288' end='0x290' /><slave name='pio_pps.mem' start='0x290' end='0x298' /><slave name='reg_diag_data_buf_im.mem' start='0x298' end='0x2A0' /><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_diag_bg.mem' start='0x5000' end='0x6000' /><slave name='ram_diag_data_buf_re.mem' start='0x6000' end='0x7000' /><slave name='ram_diag_data_buf_im.mem' start='0x7000' end='0x8000' /><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='reg_bsn_monitor.mem' start='0x80' end='0x100' /><slave name='reg_diagnostics.mem' start='0x100' end='0x200' /><slave name='ram_diag_data_buf_re.mem' start='0x200' end='0x300' /><slave name='ram_diag_data_buf_im.mem' start='0x300' end='0x400' /><slave name='avs_eth_0.mms_reg' start='0x400' end='0x440' /><slave name='reg_tr_nonbonded.mem' start='0x440' end='0x480' /><slave name='timer_0.s1' start='0x480' end='0x4A0' /><slave name='reg_unb_sens.mem' start='0x4A0' end='0x4C0' /><slave name='reg_diag_bg.mem' start='0x4C0' end='0x4E0' /><slave name='pio_debug_wave.s1' start='0x4E0' end='0x4F0' /><slave name='pio_wdi.s1' start='0x4F0' end='0x500' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x500' end='0x508' /><slave name='reg_diag_data_buf_re.mem' start='0x508' end='0x510' /><slave name='pio_pps.mem' start='0x510' end='0x518' /><slave name='reg_diag_data_buf_im.mem' start='0x518' end='0x520' /><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_diag_bg.mem' start='0x5000' end='0x6000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /></address-map>]]></parameter>
<parameter name="clockFrequency" value="25000000" />
<parameter name="deviceFamilyName" value="Stratix IV" />
<parameter name="internalIrqMaskSystemInfo" value="7" />
@@ -1357,7 +1408,7 @@ q]]></parameter>
version="1.0"
enabled="1"
name="ram_diag_data_buf_im">
- <parameter name="g_adr_w" value="10" />
+ <parameter name="g_adr_w" value="6" />
<parameter name="g_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="25000000" />
</module>
@@ -1366,7 +1417,12 @@ q]]></parameter>
version="1.0"
enabled="1"
name="ram_diag_data_buf_re">
- <parameter name="g_adr_w" value="10" />
+ <parameter name="g_adr_w" value="6" />
+ <parameter name="g_dat_w" value="32" />
+ <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="25000000" />
+ </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_dat_w" value="32" />
<parameter name="AUTO_SYSTEM_CLOCK_RATE" value="25000000" />
</module>
@@ -1408,7 +1464,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="jtag_uart_0.avalon_jtag_slave">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0280" />
+ <parameter name="baseAddress" value="0x0500" />
</connection>
<connection
kind="interrupt"
@@ -1423,7 +1479,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_debug_wave.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0260" />
+ <parameter name="baseAddress" value="0x04e0" />
</connection>
<connection
kind="avalon"
@@ -1431,7 +1487,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_wdi.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0270" />
+ <parameter name="baseAddress" value="0x04f0" />
</connection>
<connection
kind="avalon"
@@ -1439,7 +1495,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="timer_0.s1">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0200" />
+ <parameter name="baseAddress" value="0x0480" />
</connection>
<connection kind="interrupt" version="11.1" start="cpu_0.d_irq" end="timer_0.irq">
<parameter name="irqNumber" value="1" />
@@ -1485,7 +1541,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_diag_data_buf_re.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0288" />
+ <parameter name="baseAddress" value="0x0508" />
</connection>
<connection
kind="avalon"
@@ -1501,7 +1557,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="avs_eth_0.mms_reg">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0080" />
+ <parameter name="baseAddress" value="0x0400" />
</connection>
<connection
kind="avalon"
@@ -1522,7 +1578,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_unb_sens.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0220" />
+ <parameter name="baseAddress" value="0x04a0" />
</connection>
<connection
kind="reset"
@@ -1548,7 +1604,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="pio_pps.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0290" />
+ <parameter name="baseAddress" value="0x0510" />
</connection>
<connection
kind="reset"
@@ -1664,7 +1720,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_diag_bg.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0240" />
+ <parameter name="baseAddress" value="0x04c0" />
</connection>
<connection
kind="reset"
@@ -1703,7 +1759,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_tr_nonbonded.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x00c0" />
+ <parameter name="baseAddress" value="0x0440" />
</connection>
<connection
kind="clock"
@@ -1805,7 +1861,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="ram_diag_data_buf_re.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x6000" />
+ <parameter name="baseAddress" value="0x0200" />
</connection>
<connection
kind="reset"
@@ -1823,7 +1879,7 @@ q]]></parameter>
start="cpu_0.data_master"
end="reg_diag_data_buf_im.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x0298" />
+ <parameter name="baseAddress" value="0x0518" />
</connection>
<connection
kind="avalon"
@@ -1831,6 +1887,24 @@ q]]></parameter>
start="cpu_0.data_master"
end="ram_diag_data_buf_im.mem">
<parameter name="arbitrationPriority" value="1" />
- <parameter name="baseAddress" value="0x7000" />
+ <parameter name="baseAddress" value="0x0300" />
+ </connection>
+ <connection
+ kind="clock"
+ version="11.1"
+ start="clk_input.clk"
+ end="reg_bsn_monitor.system" />
+ <connection
+ kind="reset"
+ version="11.1"
+ start="clk_input.clk_reset"
+ end="reg_bsn_monitor.system_reset" />
+ <connection
+ kind="avalon"
+ version="11.1"
+ start="cpu_0.data_master"
+ end="reg_bsn_monitor.mem">
+ <parameter name="arbitrationPriority" value="1" />
+ <parameter name="baseAddress" value="0x0080" />
</connection>
</system>
--
GitLab